From 682b5d83e5e6031d42e58c5bf17fda67be6617c6 Mon Sep 17 00:00:00 2001 From: Luciano Favoroso Date: Mon, 10 Jul 2023 11:31:22 +0200 Subject: [PATCH 1/7] FDP-622: Removed manufacturer and modelcode from change firmware Signed-off-by: Luciano Favoroso --- .../services/FirmwareManagementService.java | 63 ------------------- .../endpoints/FirmwareManagementEndpoint.java | 7 --- .../schemas/firmwaremanagement-ws-core.xsd | 3 + 3 files changed, 3 insertions(+), 70 deletions(-) diff --git a/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/application/services/FirmwareManagementService.java b/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/application/services/FirmwareManagementService.java index 607443341cf..0d322f158b2 100644 --- a/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/application/services/FirmwareManagementService.java +++ b/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/application/services/FirmwareManagementService.java @@ -796,8 +796,6 @@ public void changeFirmware( @Identification final String organisationIdentification, final int id, final FirmwareFileRequest firmwareFileRequest, - final String manufacturer, - final String modelCode, final FirmwareModuleData firmwareModuleData) throws FunctionalException { @@ -811,61 +809,8 @@ public void changeFirmware( .orElseThrow( supplyFirmwareFileNotFoundException(id, firmwareFileRequest.getFileName())); - final Manufacturer databaseManufacturer = this.manufacturerRepository.findByCode(manufacturer); - - if (databaseManufacturer == null) { - LOGGER.info("Manufacturer {} doesn't exist.", manufacturer); - throw new FunctionalException( - FunctionalExceptionType.UNKNOWN_MANUFACTURER, - ComponentType.WS_CORE, - new UnknownEntityException(Manufacturer.class, manufacturer)); - } - - final DeviceModel databaseDeviceModel = - this.deviceModelRepository.findByManufacturerAndModelCode(databaseManufacturer, modelCode); - - if (databaseDeviceModel == null) { - LOGGER.info( - "DeviceModel unknown for manufacturer {} and model code {}.", manufacturer, modelCode); - throw new FunctionalException( - FunctionalExceptionType.UNKNOWN_DEVICEMODEL, - ComponentType.WS_CORE, - new UnknownEntityException(DeviceModel.class, modelCode)); - } - changedFirmwareFile.setDescription(firmwareFileRequest.getDescription()); - /* - * A firmware file has been changed to be related to (possibly) multiple - * device models to be usable across different value streams for all - * kinds of devices. - * - * This code mimics the earlier behavior with a single device model - * linked to the firmware file, where the device model is changed. - * - * If multiple device models are related, it is not clear what to do, - * and which if the device models (if any) should be removed. In such - * case the device model will be added for now. - * - * 2021-06-02: In case of multiple DeviceModels all existing must be deleted - * and all new DeviceModels in the request must be added - */ - final Set existingDeviceModels = changedFirmwareFile.getDeviceModels(); - if (existingDeviceModels.size() > 1) { - LOGGER.warn( - "Change Firmware (FirmwareFile id={}) with {} existing DeviceModels, adding {}", - changedFirmwareFile.getId(), - existingDeviceModels.size(), - databaseDeviceModel); - } else { - LOGGER.warn( - "Change Firmware (FirmwareFile id={}) with {} existing DeviceModel(s), replacing by {}", - changedFirmwareFile.getId(), - existingDeviceModels.size(), - databaseDeviceModel); - } - existingDeviceModels.clear(); - changedFirmwareFile.addDeviceModel(databaseDeviceModel); changedFirmwareFile.setFilename(firmwareFileRequest.getFileName()); changedFirmwareFile.updateFirmwareModuleData( firmwareModuleData.getVersionsByModule(this.firmwareModuleRepository, false)); @@ -875,14 +820,6 @@ public void changeFirmware( // Save the changed firmware entity changedFirmwareFile = this.firmwareFileRepository.save(changedFirmwareFile); - // Set all devicefirmwares.pushToNewDevices on false - if (firmwareFileRequest.isPushToNewDevices()) { - final List firmwareFiles = - this.firmwareFileRepository.findByDeviceModel(databaseDeviceModel); - firmwareFiles.remove(changedFirmwareFile); - this.setPushToNewDevicesToFalse(firmwareFiles); - } - this.firmwareFileRepository.save(changedFirmwareFile); } diff --git a/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java b/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java index be345a2a183..eb08999b7cc 100644 --- a/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java +++ b/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java @@ -921,18 +921,11 @@ public ChangeFirmwareResponse changeFirmware( this.firmwareManagementMapper.map( request.getFirmware().getFirmwareModuleData(), FirmwareModuleData.class); - // The ChangeFirmwareRequest accepts multiple DeviceModels to be related to a Firmware. - // This FirmwareManagementService only accepts ONE for now - final String manufacturer = this.getManufacturerFromFirmware(request.getFirmware()); - final String modelCode = this.getModelCodeFromFirmware(request.getFirmware()); - try { this.firmwareManagementService.changeFirmware( organisationIdentification, request.getId(), this.firmwareFileRequestFor(request.getFirmware()), - manufacturer, - modelCode, firmwareModuleData); } catch (final ConstraintViolationException e) { LOGGER.error("Exception Changing firmware", e); diff --git a/osgp/shared/osgp-ws-core/src/main/resources/schemas/firmwaremanagement-ws-core.xsd b/osgp/shared/osgp-ws-core/src/main/resources/schemas/firmwaremanagement-ws-core.xsd index 7d5e634771f..4c338ef2d7f 100644 --- a/osgp/shared/osgp-ws-core/src/main/resources/schemas/firmwaremanagement-ws-core.xsd +++ b/osgp/shared/osgp-ws-core/src/main/resources/schemas/firmwaremanagement-ws-core.xsd @@ -343,6 +343,9 @@ + + DeviceModels can be provided in the Firmware object. They will be ignored. + From d5aa6024f9e27938ec719d7a2b6f4bd0a1ec62c8 Mon Sep 17 00:00:00 2001 From: Luciano Favoroso Date: Mon, 17 Jul 2023 09:58:32 +0200 Subject: [PATCH 2/7] FDP-622: Updated tests Signed-off-by: Luciano Favoroso --- .../AuthorizePlatformFunctionsSteps.java | 19 +----- .../ChangeFirmwareSteps.java | 4 +- .../firmwaremanagement/FirmwareSteps.java | 54 +++++++++++++++++ .../services/FirmwareManagementService.java | 20 ++++--- .../endpoints/FirmwareManagementEndpoint.java | 60 +------------------ .../schemas/firmwaremanagement-ws-core.xsd | 20 +++++-- 6 files changed, 89 insertions(+), 88 deletions(-) diff --git a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/basicosgpfunctions/AuthorizePlatformFunctionsSteps.java b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/basicosgpfunctions/AuthorizePlatformFunctionsSteps.java index e93d24d0dda..2e39f3c2165 100644 --- a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/basicosgpfunctions/AuthorizePlatformFunctionsSteps.java +++ b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/basicosgpfunctions/AuthorizePlatformFunctionsSteps.java @@ -31,21 +31,7 @@ import org.opensmartgridplatform.adapter.ws.schema.core.devicemanagement.FindAllOrganisationsRequest; import org.opensmartgridplatform.adapter.ws.schema.core.devicemanagement.FindDevicesRequest; import org.opensmartgridplatform.adapter.ws.schema.core.devicemanagement.FindScheduledTasksRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddDeviceModelRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddManufacturerRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeDeviceModelRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeManufacturerRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.DeviceModel; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllDeviceModelsRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllManufacturersRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.Firmware; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.Manufacturer; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveDeviceModelRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveManufacturerRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.*; import org.opensmartgridplatform.cucumber.core.ScenarioContext; import org.opensmartgridplatform.cucumber.platform.PlatformKeys; import org.opensmartgridplatform.cucumber.platform.common.PlatformCommonDefaults; @@ -335,12 +321,11 @@ private void changeFirmware(final Map requestParameters) throws WebServiceSecurityException, GeneralSecurityException, IOException { final ChangeFirmwareRequest request = new ChangeFirmwareRequest(); request.setId(PlatformCommonDefaults.FIRMWARE_ID); - final Firmware firmware = new Firmware(); + final ChangeableFirmware firmware = new ChangeableFirmware(); firmware.setDescription(PlatformCommonDefaults.FIRMWARE_DESCRIPTION); final DeviceModel deviceModel = new DeviceModel(); deviceModel.setModelCode(PlatformCommonDefaults.DEVICE_MODEL_MODEL_CODE); deviceModel.setManufacturer(PlatformCommonDefaults.DEFAULT_MANUFACTURER_CODE); - firmware.getDeviceModels().add(deviceModel); firmware.setPushToNewDevices(PlatformCommonDefaults.FIRMWARE_PUSH_TO_NEW_DEVICE); request.setFirmware(firmware); ScenarioContext.current() diff --git a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/ChangeFirmwareSteps.java b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/ChangeFirmwareSteps.java index 231f23fb534..0ebf5e159ae 100644 --- a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/ChangeFirmwareSteps.java +++ b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/ChangeFirmwareSteps.java @@ -13,6 +13,7 @@ import org.opensmartgridplatform.adapter.ws.schema.core.common.OsgpResultType; import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeFirmwareRequest; import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeFirmwareResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeableFirmware; import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.Firmware; import org.opensmartgridplatform.cucumber.core.ScenarioContext; import org.opensmartgridplatform.cucumber.platform.PlatformKeys; @@ -49,8 +50,7 @@ public void receivingAnChangeFirmwareRequest(final Map requestPa request.setId((int) firmwareFileId); - final Firmware firmware = this.createAndGetFirmware(requestParameters); - firmware.setId((int) firmwareFileId); + final ChangeableFirmware firmware = this.createAndGetChangeableFirmware(requestParameters); request.setFirmware(firmware); try { diff --git a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/FirmwareSteps.java b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/FirmwareSteps.java index 0625b2aa405..7de56942332 100644 --- a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/FirmwareSteps.java +++ b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/FirmwareSteps.java @@ -16,6 +16,8 @@ import java.util.Map.Entry; import java.util.SortedSet; import java.util.stream.Collectors; + +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeableFirmware; import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.DeviceModel; import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.Firmware; import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FirmwareModuleData; @@ -116,6 +118,58 @@ protected Firmware createAndGetFirmware(final Map requestParamet return firmware; } + protected ChangeableFirmware createAndGetChangeableFirmware(final Map requestParameters) { + final ChangeableFirmware firmware = new ChangeableFirmware(); + firmware.setDescription(getString(requestParameters, PlatformKeys.FIRMWARE_DESCRIPTION, null)); + firmware.setPushToNewDevices( + getBoolean( + requestParameters, + PlatformKeys.FIRMWARE_PUSH_TO_NEW_DEVICES, + PlatformDefaults.FIRMWARE_PUSH_TO_NEW_DEVICE)); + + firmware.setFirmwareModuleData(new FirmwareModuleData()); + if (requestParameters.containsKey(PlatformKeys.FIRMWARE_MODULE_VERSION_COMM)) { + firmware + .getFirmwareModuleData() + .setModuleVersionComm( + getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_COMM, null)); + } + if (requestParameters.containsKey(PlatformKeys.FIRMWARE_MODULE_VERSION_FUNC)) { + firmware + .getFirmwareModuleData() + .setModuleVersionFunc( + getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_FUNC, null)); + } + if (requestParameters.containsKey(PlatformKeys.FIRMWARE_MODULE_VERSION_MA)) { + firmware + .getFirmwareModuleData() + .setModuleVersionMa( + getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_MA, null)); + } + if (requestParameters.containsKey(PlatformKeys.FIRMWARE_MODULE_VERSION_MBUS)) { + firmware + .getFirmwareModuleData() + .setModuleVersionMbus( + getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_MBUS, null)); + } + if (requestParameters.containsKey(PlatformKeys.FIRMWARE_MODULE_VERSION_SEC)) { + firmware + .getFirmwareModuleData() + .setModuleVersionSec( + getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_SEC, null)); + } + if (requestParameters.containsKey(PlatformKeys.FIRMWARE_MODULE_VERSION_M_BUS_DRIVER_ACTIVE)) { + firmware + .getFirmwareModuleData() + .setModuleVersionMBusDriverActive( + getString( + requestParameters, + PlatformKeys.FIRMWARE_MODULE_VERSION_M_BUS_DRIVER_ACTIVE, + null)); + } + return firmware; + } + protected void assertFirmwareFileExists( final String identification, final Map firmwareFileProperties) { final Firmware expectedFirmware = this.createAndGetFirmware(firmwareFileProperties); diff --git a/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/application/services/FirmwareManagementService.java b/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/application/services/FirmwareManagementService.java index 0d322f158b2..ea6ec694a42 100644 --- a/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/application/services/FirmwareManagementService.java +++ b/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/application/services/FirmwareManagementService.java @@ -21,6 +21,7 @@ import org.joda.time.DateTime; import org.opensmartgridplatform.adapter.ws.core.infra.jms.CommonRequestMessage; import org.opensmartgridplatform.adapter.ws.core.infra.jms.CommonRequestMessageSender; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeableFirmware; import org.opensmartgridplatform.adapter.ws.shared.db.domain.repositories.writable.WritableDeviceFirmwareFileRepository; import org.opensmartgridplatform.adapter.ws.shared.db.domain.repositories.writable.WritableDeviceModelRepository; import org.opensmartgridplatform.adapter.ws.shared.db.domain.repositories.writable.WritableDeviceRepository; @@ -795,7 +796,7 @@ public void saveDeviceFirmwareFile(final DeviceFirmwareFile deviceFirmwareFile) public void changeFirmware( @Identification final String organisationIdentification, final int id, - final FirmwareFileRequest firmwareFileRequest, + final ChangeableFirmware firmwareFileRequest, final FirmwareModuleData firmwareModuleData) throws FunctionalException { @@ -806,16 +807,19 @@ public void changeFirmware( FirmwareFile changedFirmwareFile = this.firmwareFileRepository .findById((long) id) - .orElseThrow( - supplyFirmwareFileNotFoundException(id, firmwareFileRequest.getFileName())); - - changedFirmwareFile.setDescription(firmwareFileRequest.getDescription()); + .orElseThrow(supplyFirmwareFileNotFoundException(id)); - changedFirmwareFile.setFilename(firmwareFileRequest.getFileName()); changedFirmwareFile.updateFirmwareModuleData( firmwareModuleData.getVersionsByModule(this.firmwareModuleRepository, false)); - changedFirmwareFile.setPushToNewDevices(firmwareFileRequest.isPushToNewDevices()); - changedFirmwareFile.setActive(firmwareFileRequest.isActive()); + if (!firmwareFileRequest.getDescription().isEmpty()) { + changedFirmwareFile.setDescription(firmwareFileRequest.getDescription()); + } + if (firmwareFileRequest.isPushToNewDevices() != null) { + changedFirmwareFile.setPushToNewDevices(firmwareFileRequest.isPushToNewDevices()); + } + if (firmwareFileRequest.isActive() != null) { + changedFirmwareFile.setActive(firmwareFileRequest.isActive()); + } // Save the changed firmware entity changedFirmwareFile = this.firmwareFileRepository.save(changedFirmwareFile); diff --git a/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java b/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java index eb08999b7cc..91d030197a0 100644 --- a/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java +++ b/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java @@ -16,56 +16,7 @@ import org.opensmartgridplatform.adapter.ws.endpointinterceptors.OrganisationIdentification; import org.opensmartgridplatform.adapter.ws.schema.core.common.AsyncResponse; import org.opensmartgridplatform.adapter.ws.schema.core.common.OsgpResultType; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddDeviceModelRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddDeviceModelResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddManufacturerRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddManufacturerResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddOrChangeFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddOrChangeFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeDeviceModelRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeDeviceModelResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeManufacturerRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeManufacturerResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.DeviceFirmwareHistory; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllDeviceModelsRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllDeviceModelsResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllFirmwaresRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllFirmwaresResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllManufacturersRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllManufacturersResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindDeviceModelRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindDeviceModelResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.Firmware; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FirmwareModuleType; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FirmwareVersion; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetDeviceFirmwareHistoryRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetDeviceFirmwareHistoryResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetFirmwareVersionAsyncRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetFirmwareVersionAsyncResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetFirmwareVersionRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetFirmwareVersionResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveDeviceModelRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveDeviceModelResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveManufacturerRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveManufacturerResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SaveCurrentDeviceFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SaveCurrentDeviceFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SwitchFirmwareAsyncRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SwitchFirmwareAsyncResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SwitchFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SwitchFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.UpdateFirmwareAsyncRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.UpdateFirmwareAsyncResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.UpdateFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.UpdateFirmwareResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.*; import org.opensmartgridplatform.domain.core.entities.Device; import org.opensmartgridplatform.domain.core.entities.DeviceFirmwareFile; import org.opensmartgridplatform.domain.core.entities.DeviceModel; @@ -915,18 +866,13 @@ public ChangeFirmwareResponse changeFirmware( @RequestPayload final ChangeFirmwareRequest request) throws OsgpException { - LOGGER.info("Changing firmware:{}.", request.getFirmware().getFilename()); - final FirmwareModuleData firmwareModuleData = this.firmwareManagementMapper.map( request.getFirmware().getFirmwareModuleData(), FirmwareModuleData.class); try { this.firmwareManagementService.changeFirmware( - organisationIdentification, - request.getId(), - this.firmwareFileRequestFor(request.getFirmware()), - firmwareModuleData); + organisationIdentification, request.getId(), request.getFirmware(), firmwareModuleData); } catch (final ConstraintViolationException e) { LOGGER.error("Exception Changing firmware", e); this.handleException(e); @@ -934,7 +880,7 @@ public ChangeFirmwareResponse changeFirmware( LOGGER.error( "Exception: {} while Changing firmware: {} for organisation {}", e.getMessage(), - request.getFirmware().getFilename(), + request.getId(), organisationIdentification, e); this.handleException(e); diff --git a/osgp/shared/osgp-ws-core/src/main/resources/schemas/firmwaremanagement-ws-core.xsd b/osgp/shared/osgp-ws-core/src/main/resources/schemas/firmwaremanagement-ws-core.xsd index 4c338ef2d7f..863f8726fb2 100644 --- a/osgp/shared/osgp-ws-core/src/main/resources/schemas/firmwaremanagement-ws-core.xsd +++ b/osgp/shared/osgp-ws-core/src/main/resources/schemas/firmwaremanagement-ws-core.xsd @@ -343,12 +343,9 @@ - - DeviceModels can be provided in the Firmware object. They will be ignored. - - + @@ -475,6 +472,21 @@ + + + + + + + + + + + + + + + From 0286e2c10c5bb9837b9d2381f18046274b56627f Mon Sep 17 00:00:00 2001 From: Luciano Favoroso Date: Mon, 17 Jul 2023 10:26:54 +0200 Subject: [PATCH 3/7] FDP-622: Updated formatting Signed-off-by: Luciano Favoroso --- .../ChangeFirmwareSteps.java | 1 - .../firmwaremanagement/FirmwareSteps.java | 54 +++++++++---------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/ChangeFirmwareSteps.java b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/ChangeFirmwareSteps.java index 0ebf5e159ae..f8922cf7148 100644 --- a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/ChangeFirmwareSteps.java +++ b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/ChangeFirmwareSteps.java @@ -14,7 +14,6 @@ import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeFirmwareRequest; import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeFirmwareResponse; import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeableFirmware; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.Firmware; import org.opensmartgridplatform.cucumber.core.ScenarioContext; import org.opensmartgridplatform.cucumber.platform.PlatformKeys; import org.opensmartgridplatform.cucumber.platform.common.PlatformCommonKeys; diff --git a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/FirmwareSteps.java b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/FirmwareSteps.java index 7de56942332..602039bb86f 100644 --- a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/FirmwareSteps.java +++ b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/core/firmwaremanagement/FirmwareSteps.java @@ -16,7 +16,6 @@ import java.util.Map.Entry; import java.util.SortedSet; import java.util.stream.Collectors; - import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeableFirmware; import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.DeviceModel; import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.Firmware; @@ -118,54 +117,55 @@ protected Firmware createAndGetFirmware(final Map requestParamet return firmware; } - protected ChangeableFirmware createAndGetChangeableFirmware(final Map requestParameters) { + protected ChangeableFirmware createAndGetChangeableFirmware( + final Map requestParameters) { final ChangeableFirmware firmware = new ChangeableFirmware(); firmware.setDescription(getString(requestParameters, PlatformKeys.FIRMWARE_DESCRIPTION, null)); firmware.setPushToNewDevices( - getBoolean( - requestParameters, - PlatformKeys.FIRMWARE_PUSH_TO_NEW_DEVICES, - PlatformDefaults.FIRMWARE_PUSH_TO_NEW_DEVICE)); + getBoolean( + requestParameters, + PlatformKeys.FIRMWARE_PUSH_TO_NEW_DEVICES, + PlatformDefaults.FIRMWARE_PUSH_TO_NEW_DEVICE)); firmware.setFirmwareModuleData(new FirmwareModuleData()); if (requestParameters.containsKey(PlatformKeys.FIRMWARE_MODULE_VERSION_COMM)) { firmware - .getFirmwareModuleData() - .setModuleVersionComm( - getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_COMM, null)); + .getFirmwareModuleData() + .setModuleVersionComm( + getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_COMM, null)); } if (requestParameters.containsKey(PlatformKeys.FIRMWARE_MODULE_VERSION_FUNC)) { firmware - .getFirmwareModuleData() - .setModuleVersionFunc( - getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_FUNC, null)); + .getFirmwareModuleData() + .setModuleVersionFunc( + getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_FUNC, null)); } if (requestParameters.containsKey(PlatformKeys.FIRMWARE_MODULE_VERSION_MA)) { firmware - .getFirmwareModuleData() - .setModuleVersionMa( - getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_MA, null)); + .getFirmwareModuleData() + .setModuleVersionMa( + getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_MA, null)); } if (requestParameters.containsKey(PlatformKeys.FIRMWARE_MODULE_VERSION_MBUS)) { firmware - .getFirmwareModuleData() - .setModuleVersionMbus( - getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_MBUS, null)); + .getFirmwareModuleData() + .setModuleVersionMbus( + getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_MBUS, null)); } if (requestParameters.containsKey(PlatformKeys.FIRMWARE_MODULE_VERSION_SEC)) { firmware - .getFirmwareModuleData() - .setModuleVersionSec( - getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_SEC, null)); + .getFirmwareModuleData() + .setModuleVersionSec( + getString(requestParameters, PlatformKeys.FIRMWARE_MODULE_VERSION_SEC, null)); } if (requestParameters.containsKey(PlatformKeys.FIRMWARE_MODULE_VERSION_M_BUS_DRIVER_ACTIVE)) { firmware - .getFirmwareModuleData() - .setModuleVersionMBusDriverActive( - getString( - requestParameters, - PlatformKeys.FIRMWARE_MODULE_VERSION_M_BUS_DRIVER_ACTIVE, - null)); + .getFirmwareModuleData() + .setModuleVersionMBusDriverActive( + getString( + requestParameters, + PlatformKeys.FIRMWARE_MODULE_VERSION_M_BUS_DRIVER_ACTIVE, + null)); } return firmware; } From 395f87c76737841ab03ecbc5cdd77a9b7b03dc8d Mon Sep 17 00:00:00 2001 From: Luciano Favoroso Date: Tue, 18 Jul 2023 11:24:24 +0200 Subject: [PATCH 4/7] FDP-622: Updated tests Signed-off-by: Luciano Favoroso --- .../FirmwareManagement/ChangeFirmware.feature | 29 ++----------------- 1 file changed, 2 insertions(+), 27 deletions(-) diff --git a/integration-tests/cucumber-tests-platform-common/src/test/resources/features/common/osgp-adapter-ws-core/FirmwareManagement/ChangeFirmware.feature b/integration-tests/cucumber-tests-platform-common/src/test/resources/features/common/osgp-adapter-ws-core/FirmwareManagement/ChangeFirmware.feature index 6cbeb2f85d8..74ad9ffdb63 100644 --- a/integration-tests/cucumber-tests-platform-common/src/test/resources/features/common/osgp-adapter-ws-core/FirmwareManagement/ChangeFirmware.feature +++ b/integration-tests/cucumber-tests-platform-common/src/test/resources/features/common/osgp-adapter-ws-core/FirmwareManagement/ChangeFirmware.feature @@ -13,46 +13,21 @@ Feature: FirmwareManagement change firmware | DeviceIdentification | TEST1024000000001 | And a firmware | DeviceIdentification | TEST1024000000001 | - | FirmwareFilename | OldFirmware | + | FirmwareFilename | Filename | | FirmwarePushToNewDevices | true | | ManufacturerName | Test | | ModelCode | TestModel | | Description | | When receiving an change firmware request - | FirmwareFilename | NewFirmware | | FirmwarePushToNewDevices | false | - | ManufacturerName | Test | - | ModelCode | TestModel | | FirmwareDescription | Firmware is changed! | Then the change firmware response contains | Result | OK | And the entity firmware exists | ModelCode | TestModel | - | FirmwareFilename | NewFirmware | + | FirmwareFilename | Filename | | FirmwareDescription | Firmware is changed! | - Scenario Outline: Change firmware with an unknown or empty devicemodel - Given a device - | DeviceIdentification | TEST1024000000001 | - And a firmware - | DeviceIdentification | TEST1024000000001 | - | FirmwareFilename | Firmware | - | FirmwarePushToNewDevices | true | - | ManufacturerName | Test | - | ModelCode | TestModel | - | Description | | - When receiving an change firmware request - | ModelCode | unknown | - Then the change firmware response contains soap fault - | FaultCode | SOAP-ENV:Server | - | FaultString | UNKNOWN_DEVICEMODEL | - | InnerMessage | DeviceModel with id "unknown" could not be found. | - - Examples: - | ModelCode | - | unknown | - | | - Scenario: Change the firmware for an unknown firmware When receiving an change firmware request | FirmwareFilename | Firmware | From c32bed9250cdc5e1809437cb7710099f4cf36815 Mon Sep 17 00:00:00 2001 From: Luciano Favoroso Date: Wed, 19 Jul 2023 10:43:14 +0200 Subject: [PATCH 5/7] FDP-622: Comments Signed-off-by: Luciano Favoroso --- .../AuthorizePlatformFunctionsSteps.java | 21 +++++++- .../endpoints/FirmwareManagementEndpoint.java | 51 ++++++++++++++++++- 2 files changed, 69 insertions(+), 3 deletions(-) diff --git a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/basicosgpfunctions/AuthorizePlatformFunctionsSteps.java b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/basicosgpfunctions/AuthorizePlatformFunctionsSteps.java index 2e39f3c2165..f2d36a619a2 100644 --- a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/basicosgpfunctions/AuthorizePlatformFunctionsSteps.java +++ b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/basicosgpfunctions/AuthorizePlatformFunctionsSteps.java @@ -31,7 +31,22 @@ import org.opensmartgridplatform.adapter.ws.schema.core.devicemanagement.FindAllOrganisationsRequest; import org.opensmartgridplatform.adapter.ws.schema.core.devicemanagement.FindDevicesRequest; import org.opensmartgridplatform.adapter.ws.schema.core.devicemanagement.FindScheduledTasksRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.*; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddDeviceModelRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddFirmwareRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddManufacturerRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeDeviceModelRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeFirmwareRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeManufacturerRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeableFirmware; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.DeviceModel; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllDeviceModelsRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllManufacturersRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindFirmwareRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.Firmware; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.Manufacturer; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveDeviceModelRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveFirmwareRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveManufacturerRequest; import org.opensmartgridplatform.cucumber.core.ScenarioContext; import org.opensmartgridplatform.cucumber.platform.PlatformKeys; import org.opensmartgridplatform.cucumber.platform.common.PlatformCommonDefaults; @@ -63,7 +78,9 @@ public class AuthorizePlatformFunctionsSteps { @When("receiving a platform function request") public void receivingADeviceFunctionRequest(final Map requestParameters) - throws OperationNotSupportedException, WebServiceSecurityException, GeneralSecurityException, + throws OperationNotSupportedException, + WebServiceSecurityException, + GeneralSecurityException, IOException { this.platformFunction = getEnum(requestParameters, PlatformKeys.KEY_PLATFORM_FUNCTION, PlatformFunction.class); diff --git a/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java b/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java index 91d030197a0..6acde5c0a0a 100644 --- a/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java +++ b/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java @@ -16,7 +16,56 @@ import org.opensmartgridplatform.adapter.ws.endpointinterceptors.OrganisationIdentification; import org.opensmartgridplatform.adapter.ws.schema.core.common.AsyncResponse; import org.opensmartgridplatform.adapter.ws.schema.core.common.OsgpResultType; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.*; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddDeviceModelRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddDeviceModelResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddFirmwareRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddFirmwareResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddManufacturerRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddManufacturerResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddOrChangeFirmwareRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddOrChangeFirmwareResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeDeviceModelRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeDeviceModelResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeFirmwareRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeFirmwareResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeManufacturerRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeManufacturerResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.DeviceFirmwareHistory; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllDeviceModelsRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllDeviceModelsResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllFirmwaresRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllFirmwaresResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllManufacturersRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllManufacturersResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindDeviceModelRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindDeviceModelResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindFirmwareRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindFirmwareResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.Firmware; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FirmwareModuleType; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FirmwareVersion; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetDeviceFirmwareHistoryRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetDeviceFirmwareHistoryResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetFirmwareVersionAsyncRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetFirmwareVersionAsyncResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetFirmwareVersionRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetFirmwareVersionResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveDeviceModelRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveDeviceModelResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveFirmwareRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveFirmwareResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveManufacturerRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveManufacturerResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SaveCurrentDeviceFirmwareRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SaveCurrentDeviceFirmwareResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SwitchFirmwareAsyncRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SwitchFirmwareAsyncResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SwitchFirmwareRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SwitchFirmwareResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.UpdateFirmwareAsyncRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.UpdateFirmwareAsyncResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.UpdateFirmwareRequest; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.UpdateFirmwareResponse; import org.opensmartgridplatform.domain.core.entities.Device; import org.opensmartgridplatform.domain.core.entities.DeviceFirmwareFile; import org.opensmartgridplatform.domain.core.entities.DeviceModel; From 1545ab6cc18f162f0bc1440afdbbd931caeb4c6b Mon Sep 17 00:00:00 2001 From: Luciano Favoroso Date: Wed, 19 Jul 2023 11:23:09 +0200 Subject: [PATCH 6/7] FDP-622: Added mapper Signed-off-by: Luciano Favoroso --- .../basicosgpfunctions/AuthorizePlatformFunctionsSteps.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/basicosgpfunctions/AuthorizePlatformFunctionsSteps.java b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/basicosgpfunctions/AuthorizePlatformFunctionsSteps.java index f2d36a619a2..3fc190bfebd 100644 --- a/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/basicosgpfunctions/AuthorizePlatformFunctionsSteps.java +++ b/integration-tests/cucumber-tests-platform-common/src/test/java/org/opensmartgridplatform/cucumber/platform/common/glue/steps/ws/basicosgpfunctions/AuthorizePlatformFunctionsSteps.java @@ -78,9 +78,7 @@ public class AuthorizePlatformFunctionsSteps { @When("receiving a platform function request") public void receivingADeviceFunctionRequest(final Map requestParameters) - throws OperationNotSupportedException, - WebServiceSecurityException, - GeneralSecurityException, + throws OperationNotSupportedException, WebServiceSecurityException, GeneralSecurityException, IOException { this.platformFunction = getEnum(requestParameters, PlatformKeys.KEY_PLATFORM_FUNCTION, PlatformFunction.class); From 0ebca914d22f68617fab9aa8513050c76bced8d5 Mon Sep 17 00:00:00 2001 From: Luciano Favoroso Date: Thu, 4 Jan 2024 15:57:14 +0100 Subject: [PATCH 7/7] FDP-622: Fixed type Signed-off-by: Luciano Favoroso --- .../endpoints/FirmwareManagementEndpoint.java | 53 +------------------ 1 file changed, 2 insertions(+), 51 deletions(-) diff --git a/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java b/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java index 31c2a5f16f2..53cee1c2eab 100644 --- a/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java +++ b/osgp/platform/osgp-adapter-ws-core/src/main/java/org/opensmartgridplatform/adapter/ws/core/endpoints/FirmwareManagementEndpoint.java @@ -16,56 +16,7 @@ import org.opensmartgridplatform.adapter.ws.endpointinterceptors.OrganisationIdentification; import org.opensmartgridplatform.adapter.ws.schema.core.common.AsyncResponse; import org.opensmartgridplatform.adapter.ws.schema.core.common.OsgpResultType; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddDeviceModelRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddDeviceModelResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddManufacturerRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddManufacturerResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddOrChangeFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.AddOrChangeFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeDeviceModelRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeDeviceModelResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeManufacturerRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.ChangeManufacturerResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.DeviceFirmwareHistory; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllDeviceModelsRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllDeviceModelsResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllFirmwaresRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllFirmwaresResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllManufacturersRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindAllManufacturersResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindDeviceModelRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindDeviceModelResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FindFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.Firmware; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FirmwareModuleType; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.FirmwareVersion; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetDeviceFirmwareHistoryRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetDeviceFirmwareHistoryResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetFirmwareVersionAsyncRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetFirmwareVersionAsyncResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetFirmwareVersionRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.GetFirmwareVersionResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveDeviceModelRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveDeviceModelResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveManufacturerRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.RemoveManufacturerResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SaveCurrentDeviceFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SaveCurrentDeviceFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SwitchFirmwareAsyncRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SwitchFirmwareAsyncResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SwitchFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.SwitchFirmwareResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.UpdateFirmwareAsyncRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.UpdateFirmwareAsyncResponse; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.UpdateFirmwareRequest; -import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.UpdateFirmwareResponse; +import org.opensmartgridplatform.adapter.ws.schema.core.firmwaremanagement.*; import org.opensmartgridplatform.domain.core.entities.Device; import org.opensmartgridplatform.domain.core.entities.DeviceFirmwareFile; import org.opensmartgridplatform.domain.core.entities.DeviceModel; @@ -919,7 +870,7 @@ public ChangeFirmwareResponse changeFirmware( @OrganisationIdentification final String organisationIdentification, @RequestPayload final ChangeFirmwareRequest request) throws OsgpException { - final Firmware firmware = request.getFirmware(); + final ChangeableFirmware firmware = request.getFirmware(); final FirmwareModuleData firmwareModuleData = this.firmwareManagementMapper.map(