Skip to content

Commit 70136d1

Browse files
harrymiddelburgetallharrymiddelburgetall
authored
sonar-issue-java-S6813-protocol-adapter-dlms (#1571)
* sonar-issue-java-S6813-protocol-adapter-dlms Signed-off-by: Harry Middelburg <harry.middelburg@alliander.com>
1 parent 9191618 commit 70136d1

File tree

101 files changed

+452
-372
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+452
-372
lines changed

‎osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/src/main/java/org/opensmartgridplatform/adapter/protocol/dlms/application/config/udp/UdpClient.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
import org.slf4j.Logger;
88
import org.slf4j.LoggerFactory;
9-
import org.springframework.beans.factory.annotation.Autowired;
109
import org.springframework.integration.ip.udp.UnicastSendingMessageHandler;
1110
import org.springframework.integration.support.MessageBuilder;
1211
import org.springframework.stereotype.Service;
@@ -18,7 +17,6 @@ public class UdpClient {
1817

1918
private final UnicastSendingMessageHandler udpSendingAdapter;
2019

21-
@Autowired
2220
public UdpClient(final UnicastSendingMessageHandler udpSendingAdapter) {
2321
this.udpSendingAdapter = udpSendingAdapter;
2422
}

‎osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/src/main/java/org/opensmartgridplatform/adapter/protocol/dlms/application/mapping/DataObjectToEventListConverter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.opensmartgridplatform.dto.valueobjects.smartmetering.EventDto;
2828
import org.opensmartgridplatform.dto.valueobjects.smartmetering.EventLogCategoryDto;
2929
import org.opensmartgridplatform.dto.valueobjects.smartmetering.EventLogCategoryDto.EventLogDetailsType;
30-
import org.springframework.beans.factory.annotation.Autowired;
3130
import org.springframework.stereotype.Component;
3231

3332
@Slf4j
@@ -45,7 +44,6 @@ public class DataObjectToEventListConverter {
4544

4645
private final ObjectConfigService objectConfigService;
4746

48-
@Autowired
4947
public DataObjectToEventListConverter(
5048
final DlmsHelper dlmsHelper, final ObjectConfigService objectConfigService) {
5149
this.dlmsHelper = dlmsHelper;

‎osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/src/main/java/org/opensmartgridplatform/adapter/protocol/dlms/application/mapping/DataObjectToOutageListConverter.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.opensmartgridplatform.adapter.protocol.dlms.domain.commands.utils.DlmsHelper;
1313
import org.opensmartgridplatform.adapter.protocol.dlms.exceptions.ProtocolAdapterException;
1414
import org.opensmartgridplatform.dto.valueobjects.smartmetering.OutageDto;
15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.stereotype.Component;
1716

1817
@Slf4j
@@ -23,7 +22,6 @@ public class DataObjectToOutageListConverter {
2322
private static final int NUMBER_OF_ELEMENTS = 2;
2423
private final DlmsHelper dlmsHelper;
2524

26-
@Autowired
2725
public DataObjectToOutageListConverter(final DlmsHelper dlmsHelper) {
2826
this.dlmsHelper = dlmsHelper;
2927
}

‎osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/src/main/java/org/opensmartgridplatform/adapter/protocol/dlms/application/services/ConfigurationService.java

Lines changed: 86 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,6 @@
7272
import org.opensmartgridplatform.shared.infra.jms.MessageMetadata;
7373
import org.slf4j.Logger;
7474
import org.slf4j.LoggerFactory;
75-
import org.springframework.beans.factory.annotation.Autowired;
7675
import org.springframework.stereotype.Service;
7776

7877
@Service(value = "dlmsConfigurationService")
@@ -82,62 +81,93 @@ public class ConfigurationService {
8281

8382
private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationService.class);
8483

85-
@Autowired private DomainHelperService domainHelperService;
86-
87-
@Autowired private FirmwareService firmwareService;
88-
89-
@Autowired private SetSpecialDaysCommandExecutor setSpecialDaysCommandExecutor;
90-
91-
@Autowired private SetAlarmNotificationsCommandExecutor setAlarmNotificationsCommandExecutor;
92-
93-
@Autowired private SetConfigurationObjectCommandExecutor setConfigurationObjectCommandExecutor;
94-
95-
@Autowired private SetPushSetupAlarmCommandExecutor setPushSetupAlarmCommandExecutor;
96-
97-
@Autowired private SetPushSetupLastGaspCommandExecutor setPushSetupLastGaspCommandExecutor;
98-
99-
@Autowired private SetPushSetupSmsCommandExecutor setPushSetupSmsCommandExecutor;
100-
101-
@Autowired private SetPushSetupUdpCommandExecutor setPushSetupUdpCommandExecutor;
102-
103-
@Autowired private SetThdConfigurationCommandExecutor setThdConfigurationCommandExecutor;
104-
105-
@Autowired private SetActivityCalendarCommandExecutor setActivityCalendarCommandExecutor;
106-
107-
@Autowired private SetKeyOnGMeterCommandExecutor setKeyOnGMeterCommandExecutor;
108-
109-
@Autowired private GetMBusDeviceOnChannelCommandExecutor getMBusDeviceOnChannelCommandExecutor;
110-
111-
@Autowired private SetAdministrativeStatusCommandExecutor setAdministrativeStatusCommandExecutor;
112-
113-
@Autowired private GetAdministrativeStatusCommandExecutor getAdministrativeStatusCommandExecutor;
114-
115-
@Autowired private GetFirmwareVersionsCommandExecutor getFirmwareVersionCommandExecutor;
116-
117-
@Autowired private GetFirmwareVersionsGasCommandExecutor getFirmwareVersionGasCommandExecutor;
118-
119-
@Autowired private ReplaceKeyCommandExecutor replaceKeyCommandExecutor;
120-
121-
@Autowired private SetClockConfigurationCommandExecutor setClockConfigurationCommandExecutor;
122-
123-
@Autowired private GetConfigurationObjectCommandExecutor getConfigurationObjectCommandExecutor;
124-
125-
@Autowired private GenerateAndReplaceKeyCommandExecutor generateAndReplaceKeyCommandExecutor;
126-
127-
@Autowired
128-
private ConfigureDefinableLoadProfileCommandExecutor configureDefinableLoadProfileCommandExecutor;
129-
130-
@Autowired
131-
private GetMbusEncryptionKeyStatusCommandExecutor getMbusEncryptionKeyStatusCommandExecutor;
132-
133-
@Autowired
134-
private GetMbusEncryptionKeyStatusByChannelCommandExecutor
84+
private final DomainHelperService domainHelperService;
85+
private final FirmwareService firmwareService;
86+
private final SetSpecialDaysCommandExecutor setSpecialDaysCommandExecutor;
87+
private final SetAlarmNotificationsCommandExecutor setAlarmNotificationsCommandExecutor;
88+
private final SetConfigurationObjectCommandExecutor setConfigurationObjectCommandExecutor;
89+
private final SetPushSetupAlarmCommandExecutor setPushSetupAlarmCommandExecutor;
90+
private final SetPushSetupLastGaspCommandExecutor setPushSetupLastGaspCommandExecutor;
91+
private final SetPushSetupSmsCommandExecutor setPushSetupSmsCommandExecutor;
92+
private final SetPushSetupUdpCommandExecutor setPushSetupUdpCommandExecutor;
93+
private final SetThdConfigurationCommandExecutor setThdConfigurationCommandExecutor;
94+
private final SetActivityCalendarCommandExecutor setActivityCalendarCommandExecutor;
95+
private final SetKeyOnGMeterCommandExecutor setKeyOnGMeterCommandExecutor;
96+
private final GetMBusDeviceOnChannelCommandExecutor getMBusDeviceOnChannelCommandExecutor;
97+
private final SetAdministrativeStatusCommandExecutor setAdministrativeStatusCommandExecutor;
98+
private final GetAdministrativeStatusCommandExecutor getAdministrativeStatusCommandExecutor;
99+
private final GetFirmwareVersionsCommandExecutor getFirmwareVersionCommandExecutor;
100+
private final GetFirmwareVersionsGasCommandExecutor getFirmwareVersionGasCommandExecutor;
101+
private final ReplaceKeyCommandExecutor replaceKeyCommandExecutor;
102+
private final SetClockConfigurationCommandExecutor setClockConfigurationCommandExecutor;
103+
private final GetConfigurationObjectCommandExecutor getConfigurationObjectCommandExecutor;
104+
private final GenerateAndReplaceKeyCommandExecutor generateAndReplaceKeyCommandExecutor;
105+
private final ConfigureDefinableLoadProfileCommandExecutor
106+
configureDefinableLoadProfileCommandExecutor;
107+
private final GetMbusEncryptionKeyStatusCommandExecutor getMbusEncryptionKeyStatusCommandExecutor;
108+
private final GetMbusEncryptionKeyStatusByChannelCommandExecutor
135109
getMbusEncryptionKeyStatusByChannelCommandExecutor;
136-
137-
@Autowired
138-
private SetRandomisationSettingsCommandExecutor setRandomisationSettingsCommandExecutor;
139-
140-
@Autowired private GetKeysService getKeysService;
110+
private final SetRandomisationSettingsCommandExecutor setRandomisationSettingsCommandExecutor;
111+
private final GetKeysService getKeysService;
112+
113+
public ConfigurationService(
114+
final DomainHelperService domainHelperService,
115+
final FirmwareService firmwareService,
116+
final SetSpecialDaysCommandExecutor setSpecialDaysCommandExecutor,
117+
final SetAlarmNotificationsCommandExecutor setAlarmNotificationsCommandExecutor,
118+
final SetConfigurationObjectCommandExecutor setConfigurationObjectCommandExecutor,
119+
final SetPushSetupAlarmCommandExecutor setPushSetupAlarmCommandExecutor,
120+
final SetPushSetupLastGaspCommandExecutor setPushSetupLastGaspCommandExecutor,
121+
final SetPushSetupSmsCommandExecutor setPushSetupSmsCommandExecutor,
122+
final SetPushSetupUdpCommandExecutor setPushSetupUdpCommandExecutor,
123+
final SetThdConfigurationCommandExecutor setThdConfigurationCommandExecutor,
124+
final SetActivityCalendarCommandExecutor setActivityCalendarCommandExecutor,
125+
final SetKeyOnGMeterCommandExecutor setKeyOnGMeterCommandExecutor,
126+
final GetMBusDeviceOnChannelCommandExecutor getMBusDeviceOnChannelCommandExecutor,
127+
final SetAdministrativeStatusCommandExecutor setAdministrativeStatusCommandExecutor,
128+
final GetAdministrativeStatusCommandExecutor getAdministrativeStatusCommandExecutor,
129+
final GetFirmwareVersionsCommandExecutor getFirmwareVersionCommandExecutor,
130+
final GetFirmwareVersionsGasCommandExecutor getFirmwareVersionGasCommandExecutor,
131+
final ReplaceKeyCommandExecutor replaceKeyCommandExecutor,
132+
final SetClockConfigurationCommandExecutor setClockConfigurationCommandExecutor,
133+
final GetConfigurationObjectCommandExecutor getConfigurationObjectCommandExecutor,
134+
final GenerateAndReplaceKeyCommandExecutor generateAndReplaceKeyCommandExecutor,
135+
final ConfigureDefinableLoadProfileCommandExecutor
136+
configureDefinableLoadProfileCommandExecutor,
137+
final GetMbusEncryptionKeyStatusCommandExecutor getMbusEncryptionKeyStatusCommandExecutor,
138+
final GetMbusEncryptionKeyStatusByChannelCommandExecutor
139+
getMbusEncryptionKeyStatusByChannelCommandExecutor,
140+
final SetRandomisationSettingsCommandExecutor setRandomisationSettingsCommandExecutor,
141+
final GetKeysService getKeysService) {
142+
this.domainHelperService = domainHelperService;
143+
this.firmwareService = firmwareService;
144+
this.setSpecialDaysCommandExecutor = setSpecialDaysCommandExecutor;
145+
this.setAlarmNotificationsCommandExecutor = setAlarmNotificationsCommandExecutor;
146+
this.setConfigurationObjectCommandExecutor = setConfigurationObjectCommandExecutor;
147+
this.setPushSetupAlarmCommandExecutor = setPushSetupAlarmCommandExecutor;
148+
this.setPushSetupLastGaspCommandExecutor = setPushSetupLastGaspCommandExecutor;
149+
this.setPushSetupSmsCommandExecutor = setPushSetupSmsCommandExecutor;
150+
this.setPushSetupUdpCommandExecutor = setPushSetupUdpCommandExecutor;
151+
this.setThdConfigurationCommandExecutor = setThdConfigurationCommandExecutor;
152+
this.setActivityCalendarCommandExecutor = setActivityCalendarCommandExecutor;
153+
this.setKeyOnGMeterCommandExecutor = setKeyOnGMeterCommandExecutor;
154+
this.getMBusDeviceOnChannelCommandExecutor = getMBusDeviceOnChannelCommandExecutor;
155+
this.setAdministrativeStatusCommandExecutor = setAdministrativeStatusCommandExecutor;
156+
this.getAdministrativeStatusCommandExecutor = getAdministrativeStatusCommandExecutor;
157+
this.getFirmwareVersionCommandExecutor = getFirmwareVersionCommandExecutor;
158+
this.getFirmwareVersionGasCommandExecutor = getFirmwareVersionGasCommandExecutor;
159+
this.replaceKeyCommandExecutor = replaceKeyCommandExecutor;
160+
this.setClockConfigurationCommandExecutor = setClockConfigurationCommandExecutor;
161+
this.getConfigurationObjectCommandExecutor = getConfigurationObjectCommandExecutor;
162+
this.generateAndReplaceKeyCommandExecutor = generateAndReplaceKeyCommandExecutor;
163+
this.configureDefinableLoadProfileCommandExecutor =
164+
configureDefinableLoadProfileCommandExecutor;
165+
this.getMbusEncryptionKeyStatusCommandExecutor = getMbusEncryptionKeyStatusCommandExecutor;
166+
this.getMbusEncryptionKeyStatusByChannelCommandExecutor =
167+
getMbusEncryptionKeyStatusByChannelCommandExecutor;
168+
this.setRandomisationSettingsCommandExecutor = setRandomisationSettingsCommandExecutor;
169+
this.getKeysService = getKeysService;
170+
}
141171

142172
public void setSpecialDays(
143173
final DlmsConnectionManager conn,

‎osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/src/main/java/org/opensmartgridplatform/adapter/protocol/dlms/application/services/DeviceKeyProcessingService.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import org.opensmartgridplatform.shared.exceptionhandling.ComponentType;
1515
import org.opensmartgridplatform.shared.exceptionhandling.FunctionalException;
1616
import org.opensmartgridplatform.shared.exceptionhandling.FunctionalExceptionType;
17-
import org.springframework.beans.factory.annotation.Autowired;
1817
import org.springframework.beans.factory.annotation.Value;
1918
import org.springframework.stereotype.Component;
2019
import org.springframework.transaction.annotation.Transactional;
@@ -29,7 +28,6 @@ public class DeviceKeyProcessingService {
2928

3029
private final DlmsDeviceRepository dlmsDeviceRepository;
3130

32-
@Autowired
3331
public DeviceKeyProcessingService(final DlmsDeviceRepository dlmsDeviceRepository) {
3432
this.dlmsDeviceRepository = dlmsDeviceRepository;
3533
}

‎osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/src/main/java/org/opensmartgridplatform/adapter/protocol/dlms/application/services/GetKeysService.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.opensmartgridplatform.shared.infra.jms.MessageMetadata;
1717
import org.opensmartgridplatform.shared.security.RsaEncrypter;
1818
import org.opensmartgridplatform.ws.schema.core.secret.management.SecretType;
19-
import org.springframework.beans.factory.annotation.Autowired;
2019
import org.springframework.beans.factory.annotation.Qualifier;
2120
import org.springframework.stereotype.Component;
2221

@@ -27,7 +26,6 @@ public class GetKeysService {
2726
private final SecretManagementService secretManagementService;
2827
private final RsaEncrypter encrypterForGxfSmartMetering;
2928

30-
@Autowired
3129
public GetKeysService(
3230
final SecretManagementService secretManagementService,
3331
@Qualifier(value = "encrypterForGxfSmartMetering")

‎osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/src/main/java/org/opensmartgridplatform/adapter/protocol/dlms/application/services/InstallationService.java

Lines changed: 23 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -41,30 +41,37 @@
4141
import org.opensmartgridplatform.shared.exceptionhandling.FunctionalExceptionType;
4242
import org.opensmartgridplatform.shared.infra.jms.MessageMetadata;
4343
import org.opensmartgridplatform.shared.security.RsaEncrypter;
44-
import org.springframework.beans.factory.annotation.Autowired;
4544
import org.springframework.beans.factory.annotation.Qualifier;
4645
import org.springframework.stereotype.Service;
4746

4847
@Slf4j
4948
@Service(value = "dlmsInstallationService")
5049
public class InstallationService {
5150

52-
@Autowired private DlmsDeviceRepository dlmsDeviceRepository;
51+
private final DlmsDeviceRepository dlmsDeviceRepository;
52+
private final InstallationMapper installationMapper;
53+
private final RsaEncrypter decrypterForGxfSmartMetering;
54+
private final SecretManagementService secretManagementService;
55+
private final CoupleMBusDeviceCommandExecutor coupleMBusDeviceCommandExecutor;
56+
private final DecoupleMBusDeviceCommandExecutor decoupleMBusDeviceCommandExecutor;
57+
private final CoupleMbusDeviceByChannelCommandExecutor coupleMbusDeviceByChannelCommandExecutor;
5358

54-
@Autowired private InstallationMapper installationMapper;
55-
56-
@Autowired
57-
@Qualifier("decrypterForGxfSmartMetering")
58-
private RsaEncrypter decrypterForGxfSmartMetering;
59-
60-
@Autowired private SecretManagementService secretManagementService;
61-
62-
@Autowired private CoupleMBusDeviceCommandExecutor coupleMBusDeviceCommandExecutor;
63-
64-
@Autowired private DecoupleMBusDeviceCommandExecutor decoupleMBusDeviceCommandExecutor;
65-
66-
@Autowired
67-
private CoupleMbusDeviceByChannelCommandExecutor coupleMbusDeviceByChannelCommandExecutor;
59+
public InstallationService(
60+
final DlmsDeviceRepository dlmsDeviceRepository,
61+
final InstallationMapper installationMapper,
62+
@Qualifier("decrypterForGxfSmartMetering") final RsaEncrypter decrypterForGxfSmartMetering,
63+
final SecretManagementService secretManagementService,
64+
final CoupleMBusDeviceCommandExecutor coupleMBusDeviceCommandExecutor,
65+
final DecoupleMBusDeviceCommandExecutor decoupleMBusDeviceCommandExecutor,
66+
final CoupleMbusDeviceByChannelCommandExecutor coupleMbusDeviceByChannelCommandExecutor) {
67+
this.dlmsDeviceRepository = dlmsDeviceRepository;
68+
this.installationMapper = installationMapper;
69+
this.decrypterForGxfSmartMetering = decrypterForGxfSmartMetering;
70+
this.secretManagementService = secretManagementService;
71+
this.coupleMBusDeviceCommandExecutor = coupleMBusDeviceCommandExecutor;
72+
this.decoupleMBusDeviceCommandExecutor = decoupleMBusDeviceCommandExecutor;
73+
this.coupleMbusDeviceByChannelCommandExecutor = coupleMbusDeviceByChannelCommandExecutor;
74+
}
6875

6976
public void addMeter(
7077
final MessageMetadata messageMetadata, final SmartMeteringDeviceDto smartMeteringDevice)

‎osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/src/main/java/org/opensmartgridplatform/adapter/protocol/dlms/application/services/MacGenerationService.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.opensmartgridplatform.adapter.protocol.dlms.domain.entities.SecurityKeyType;
2828
import org.opensmartgridplatform.adapter.protocol.dlms.exceptions.ProtocolAdapterException;
2929
import org.opensmartgridplatform.shared.infra.jms.MessageMetadata;
30-
import org.springframework.beans.factory.annotation.Autowired;
3130
import org.springframework.stereotype.Service;
3231

3332
/**
@@ -59,7 +58,11 @@ public class MacGenerationService {
5958
private static final int ADDRESS_LENGTH = 8;
6059
private static final int SECURITY_LENGTH = 16;
6160

62-
@Autowired private SecretManagementService secretManagementService;
61+
private final SecretManagementService secretManagementService;
62+
63+
public MacGenerationService(final SecretManagementService secretManagementService) {
64+
this.secretManagementService = secretManagementService;
65+
}
6366

6467
public byte[] calculateMac(
6568
final MessageMetadata messageMetadata,

‎osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/src/main/java/org/opensmartgridplatform/adapter/protocol/dlms/application/services/ManagementService.java

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,34 @@
3030
import org.opensmartgridplatform.dto.valueobjects.smartmetering.UpdateProtocolResponseDto;
3131
import org.opensmartgridplatform.shared.exceptionhandling.OsgpException;
3232
import org.opensmartgridplatform.shared.infra.jms.MessageMetadata;
33-
import org.springframework.beans.factory.annotation.Autowired;
3433
import org.springframework.stereotype.Service;
3534

3635
@Slf4j
3736
@Service(value = "dlmsManagementService")
3837
public class ManagementService {
3938

40-
@Autowired private FindEventsCommandExecutor findEventsCommandExecutor;
41-
42-
@Autowired private GetGsmDiagnosticCommandExecutor getGsmDiagnosticCommandExecutor;
43-
44-
@Autowired
45-
private ClearMBusStatusOnAllChannelsCommandExecutor clearMBusStatusOnAllChannelsCommandExecutor;
46-
47-
@Autowired
48-
private SetDeviceLifecycleStatusByChannelCommandExecutor
39+
private final FindEventsCommandExecutor findEventsCommandExecutor;
40+
private final GetGsmDiagnosticCommandExecutor getGsmDiagnosticCommandExecutor;
41+
private final ClearMBusStatusOnAllChannelsCommandExecutor
42+
clearMBusStatusOnAllChannelsCommandExecutor;
43+
private final SetDeviceLifecycleStatusByChannelCommandExecutor
4944
setDeviceLifecycleStatusByChannelCommandExecutor;
50-
51-
@Autowired private DlmsDeviceRepository dlmsDeviceRepository;
45+
private final DlmsDeviceRepository dlmsDeviceRepository;
46+
47+
public ManagementService(
48+
final FindEventsCommandExecutor findEventsCommandExecutor,
49+
final GetGsmDiagnosticCommandExecutor getGsmDiagnosticCommandExecutor,
50+
final ClearMBusStatusOnAllChannelsCommandExecutor clearMBusStatusOnAllChannelsCommandExecutor,
51+
final SetDeviceLifecycleStatusByChannelCommandExecutor
52+
setDeviceLifecycleStatusByChannelCommandExecutor,
53+
final DlmsDeviceRepository dlmsDeviceRepository) {
54+
this.findEventsCommandExecutor = findEventsCommandExecutor;
55+
this.getGsmDiagnosticCommandExecutor = getGsmDiagnosticCommandExecutor;
56+
this.clearMBusStatusOnAllChannelsCommandExecutor = clearMBusStatusOnAllChannelsCommandExecutor;
57+
this.setDeviceLifecycleStatusByChannelCommandExecutor =
58+
setDeviceLifecycleStatusByChannelCommandExecutor;
59+
this.dlmsDeviceRepository = dlmsDeviceRepository;
60+
}
5261

5362
public GetGsmDiagnosticResponseDto getGsmDiagnostic(
5463
final DlmsConnectionManager conn,

‎osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/src/main/java/org/opensmartgridplatform/adapter/protocol/dlms/application/services/SystemEventService.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.opensmartgridplatform.shared.infra.jms.MessageType;
1717
import org.opensmartgridplatform.shared.infra.jms.RequestMessage;
1818
import org.opensmartgridplatform.shared.wsheaderattribute.priority.MessagePriorityEnum;
19-
import org.springframework.beans.factory.annotation.Autowired;
2019
import org.springframework.beans.factory.annotation.Value;
2120
import org.springframework.stereotype.Service;
2221

@@ -28,7 +27,6 @@ public class SystemEventService {
2827
private final CorrelationIdProviderService correlationIdProviderService;
2928
private final long invocationCounterEventThreshold;
3029

31-
@Autowired
3230
public SystemEventService(
3331
final OsgpRequestMessageSender osgpRequestMessageSender,
3432
final CorrelationIdProviderService correlationIdProviderService,

0 commit comments

Comments
 (0)