From bda8d32b8d1b5128b2b6b0b41043ae2d90b82694 Mon Sep 17 00:00:00 2001 From: Andre Bolder Date: Mon, 4 Jul 2022 09:13:55 +0200 Subject: [PATCH] SMHE-832: Log error instead of stacktrace and use version 5.0.0 for SMR --- .../domain/smartmetering/service/DlmsObjectService.java | 4 +++- .../meter-profile-config-SMR-5.0-GetActualMeterReads.json | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/osgp/platform/osgp-domain-smartmetering/src/main/java/org/opensmartgridplatform/domain/smartmetering/service/DlmsObjectService.java b/osgp/platform/osgp-domain-smartmetering/src/main/java/org/opensmartgridplatform/domain/smartmetering/service/DlmsObjectService.java index 2c364a161e..ae2559de12 100644 --- a/osgp/platform/osgp-domain-smartmetering/src/main/java/org/opensmartgridplatform/domain/smartmetering/service/DlmsObjectService.java +++ b/osgp/platform/osgp-domain-smartmetering/src/main/java/org/opensmartgridplatform/domain/smartmetering/service/DlmsObjectService.java @@ -16,6 +16,7 @@ import java.util.Map; import java.util.Optional; import java.util.stream.Stream; +import lombok.extern.slf4j.Slf4j; import org.opensmartgridplatform.domain.smartmetering.config.CosemObject; import org.opensmartgridplatform.domain.smartmetering.config.MeterConfig; import org.springframework.core.io.Resource; @@ -23,6 +24,7 @@ import org.springframework.stereotype.Service; @Service +@Slf4j public class DlmsObjectService { private List meterConfigList; @@ -109,7 +111,7 @@ private List getMeterConfigListFromResources() throws IOException { objectMapper.readValue(resource.getInputStream(), MeterConfig.class); meterConfigs.add(meterConfig); } catch (final IOException e) { - e.printStackTrace(); + log.error(String.format("Cannot read config file %s", resource.getFilename()), e); } }); diff --git a/osgp/platform/osgp-domain-smartmetering/src/main/resources/meter-config/meter-profile-config-SMR-5.0-GetActualMeterReads.json b/osgp/platform/osgp-domain-smartmetering/src/main/resources/meter-config/meter-profile-config-SMR-5.0-GetActualMeterReads.json index 4dc9b5f892..80d29424e1 100644 --- a/osgp/platform/osgp-domain-smartmetering/src/main/resources/meter-config/meter-profile-config-SMR-5.0-GetActualMeterReads.json +++ b/osgp/platform/osgp-domain-smartmetering/src/main/resources/meter-config/meter-profile-config-SMR-5.0-GetActualMeterReads.json @@ -1,6 +1,6 @@ { "profile": "SMR", - "version": "5.0", + "version": "5.0.0", "description": "Profile for Smart Meter Requirements 5.0", "settings": [ {