Skip to content

Commit 6ef1e5d

Browse files
harrymiddelburgetallharrymiddelburgetall
authored
sonar-issue-java-s6813-adapter-domain-smartmetering (#1573)
Signed-off-by: Harry Middelburg <harry.middelburg@alliander.com>
1 parent 70136d1 commit 6ef1e5d

File tree

104 files changed

+490
-564
lines changed

Some content is hidden

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

104 files changed

+490
-564
lines changed

‎osgp/platform/osgp-adapter-domain-smartmetering/src/main/java/org/opensmartgridplatform/adapter/domain/smartmetering/application/services/ActionMapperService.java

Lines changed: 30 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,6 @@
129129
import org.opensmartgridplatform.shared.exceptionhandling.ComponentType;
130130
import org.opensmartgridplatform.shared.exceptionhandling.FunctionalException;
131131
import org.opensmartgridplatform.shared.exceptionhandling.FunctionalExceptionType;
132-
import org.springframework.beans.factory.annotation.Autowired;
133132
import org.springframework.beans.factory.annotation.Qualifier;
134133
import org.springframework.stereotype.Service;
135134
import org.springframework.validation.annotation.Validated;
@@ -216,30 +215,39 @@ public class ActionMapperService {
216215
CLASS_MAP.put(TestAlarmSchedulerRequestData.class, TestAlarmSchedulerRequestDto.class);
217216
}
218217

219-
@Autowired
220-
@Qualifier("configurationMapper")
221-
private ConfigurationMapper configurationMapper;
222-
223-
@Autowired private ManagementMapper managementMapper;
224-
225-
@Autowired private MonitoringMapper monitoringMapper;
226-
227-
@Autowired private CommonMapper commonMapper;
228-
229-
@Autowired private PeriodicReadsRequestGasDataConverter periodicReadsRequestGasDataConverter;
230-
231-
@Autowired
232-
private ActualMeterReadsRequestGasRequestDataConverter actualReadsRequestGasDataConverter;
233-
234-
@Autowired private SetKeyOnGMeterDataConverter setKeyOnGMeterDataConverter;
235-
236-
@Autowired
237-
private GetFirmwareVersionGasRequestDataConverter getFirmwareVersionGasRequestDataConverter;
238-
239-
@Autowired private DomainHelperService domainHelperService;
218+
private final ConfigurationMapper configurationMapper;
219+
private final ManagementMapper managementMapper;
220+
private final MonitoringMapper monitoringMapper;
221+
private final CommonMapper commonMapper;
222+
private final PeriodicReadsRequestGasDataConverter periodicReadsRequestGasDataConverter;
223+
private final ActualMeterReadsRequestGasRequestDataConverter actualReadsRequestGasDataConverter;
224+
private final SetKeyOnGMeterDataConverter setKeyOnGMeterDataConverter;
225+
private final GetFirmwareVersionGasRequestDataConverter getFirmwareVersionGasRequestDataConverter;
226+
private final DomainHelperService domainHelperService;
240227

241228
private final FaultResponseFactory faultResponseFactory = new FaultResponseFactory();
242229

230+
public ActionMapperService(
231+
@Qualifier("configurationMapper") final ConfigurationMapper configurationMapper,
232+
final ManagementMapper managementMapper,
233+
final MonitoringMapper monitoringMapper,
234+
final CommonMapper commonMapper,
235+
final PeriodicReadsRequestGasDataConverter periodicReadsRequestGasDataConverter,
236+
final ActualMeterReadsRequestGasRequestDataConverter actualReadsRequestGasDataConverter,
237+
final SetKeyOnGMeterDataConverter setKeyOnGMeterDataConverter,
238+
final GetFirmwareVersionGasRequestDataConverter getFirmwareVersionGasRequestDataConverter,
239+
final DomainHelperService domainHelperService) {
240+
this.configurationMapper = configurationMapper;
241+
this.managementMapper = managementMapper;
242+
this.monitoringMapper = monitoringMapper;
243+
this.commonMapper = commonMapper;
244+
this.periodicReadsRequestGasDataConverter = periodicReadsRequestGasDataConverter;
245+
this.actualReadsRequestGasDataConverter = actualReadsRequestGasDataConverter;
246+
this.setKeyOnGMeterDataConverter = setKeyOnGMeterDataConverter;
247+
this.getFirmwareVersionGasRequestDataConverter = getFirmwareVersionGasRequestDataConverter;
248+
this.domainHelperService = domainHelperService;
249+
}
250+
243251
/** Specifies which mapper to use for the core class received. */
244252
@PostConstruct
245253
private void postConstruct() {

‎osgp/platform/osgp-adapter-domain-smartmetering/src/main/java/org/opensmartgridplatform/adapter/domain/smartmetering/infra/jms/core/in/messageprocessors/PushNotificationAlarmRequestMessageProcessor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
import org.opensmartgridplatform.shared.infra.jms.MessageProcessorMap;
1313
import org.opensmartgridplatform.shared.infra.jms.MessageType;
1414
import org.opensmartgridplatform.shared.infra.jms.RequestMessage;
15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.beans.factory.annotation.Qualifier;
1716
import org.springframework.stereotype.Component;
1817

1918
/** Class for processing smart metering push notification alarm request messages. */
2019
@Component
2120
public class PushNotificationAlarmRequestMessageProcessor extends BaseRequestMessageProcessor {
2221

23-
@Autowired private NotificationService notificationService;
22+
private final NotificationService notificationService;
2423

25-
@Autowired
2624
protected PushNotificationAlarmRequestMessageProcessor(
2725
@Qualifier("domainSmartMeteringInboundOsgpCoreRequestsMessageProcessorMap")
28-
final MessageProcessorMap messageProcessorMap) {
26+
final MessageProcessorMap messageProcessorMap,
27+
final NotificationService notificationService) {
2928
super(messageProcessorMap, MessageType.PUSH_NOTIFICATION_ALARM);
29+
this.notificationService = notificationService;
3030
}
3131

3232
@Override

‎osgp/platform/osgp-adapter-domain-smartmetering/src/main/java/org/opensmartgridplatform/adapter/domain/smartmetering/infra/jms/core/in/messageprocessors/SystemEventRequestMessageProcessor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,21 +12,21 @@
1212
import org.opensmartgridplatform.shared.infra.jms.MessageProcessorMap;
1313
import org.opensmartgridplatform.shared.infra.jms.MessageType;
1414
import org.opensmartgridplatform.shared.infra.jms.RequestMessage;
15-
import org.springframework.beans.factory.annotation.Autowired;
1615
import org.springframework.beans.factory.annotation.Qualifier;
1716
import org.springframework.stereotype.Component;
1817

1918
/** Class for processing smart metering system event request messages. */
2019
@Component
2120
public class SystemEventRequestMessageProcessor extends BaseRequestMessageProcessor {
2221

23-
@Autowired private NotificationService notificationService;
22+
private final NotificationService notificationService;
2423

25-
@Autowired
2624
protected SystemEventRequestMessageProcessor(
2725
@Qualifier("domainSmartMeteringInboundOsgpCoreRequestsMessageProcessorMap")
28-
final MessageProcessorMap messageProcessorMap) {
26+
final MessageProcessorMap messageProcessorMap,
27+
final NotificationService notificationService) {
2928
super(messageProcessorMap, MessageType.SYSTEM_EVENT);
29+
this.notificationService = notificationService;
3030
}
3131

3232
@Override

‎osgp/platform/osgp-adapter-domain-smartmetering/src/main/java/org/opensmartgridplatform/adapter/domain/smartmetering/infra/jms/core/messageprocessors/ActualMeterReadsResponseMessageProcessor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,25 +15,25 @@
1515
import org.opensmartgridplatform.shared.infra.jms.MessageProcessorMap;
1616
import org.opensmartgridplatform.shared.infra.jms.MessageType;
1717
import org.opensmartgridplatform.shared.infra.jms.ResponseMessage;
18-
import org.springframework.beans.factory.annotation.Autowired;
1918
import org.springframework.beans.factory.annotation.Qualifier;
2019
import org.springframework.stereotype.Component;
2120

2221
@Component
2322
public class ActualMeterReadsResponseMessageProcessor extends OsgpCoreResponseMessageProcessor {
2423

25-
@Autowired private MonitoringService monitoringService;
24+
private final MonitoringService monitoringService;
2625

27-
@Autowired
2826
protected ActualMeterReadsResponseMessageProcessor(
2927
final WebServiceResponseMessageSender responseMessageSender,
3028
@Qualifier("domainSmartMeteringInboundOsgpCoreResponsesMessageProcessorMap")
31-
final MessageProcessorMap messageProcessorMap) {
29+
final MessageProcessorMap messageProcessorMap,
30+
final MonitoringService monitoringService) {
3231
super(
3332
responseMessageSender,
3433
messageProcessorMap,
3534
MessageType.REQUEST_ACTUAL_METER_DATA,
3635
ComponentType.DOMAIN_SMART_METERING);
36+
this.monitoringService = monitoringService;
3737
}
3838

3939
@Override

‎osgp/platform/osgp-adapter-domain-smartmetering/src/main/java/org/opensmartgridplatform/adapter/domain/smartmetering/infra/jms/core/messageprocessors/ActualPowerQualityResponseMessageProcessor.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,27 +16,26 @@
1616
import org.opensmartgridplatform.shared.infra.jms.MessageProcessorMap;
1717
import org.opensmartgridplatform.shared.infra.jms.MessageType;
1818
import org.opensmartgridplatform.shared.infra.jms.ResponseMessage;
19-
import org.springframework.beans.factory.annotation.Autowired;
2019
import org.springframework.beans.factory.annotation.Qualifier;
2120
import org.springframework.stereotype.Component;
2221

2322
@Component
2423
public class ActualPowerQualityResponseMessageProcessor extends OsgpCoreResponseMessageProcessor {
2524

26-
@Autowired
27-
@Qualifier("domainSmartMeteringMonitoringService")
28-
private MonitoringService monitoringService;
25+
private final MonitoringService monitoringService;
2926

30-
@Autowired
3127
protected ActualPowerQualityResponseMessageProcessor(
3228
final WebServiceResponseMessageSender responseMessageSender,
3329
@Qualifier("domainSmartMeteringInboundOsgpCoreResponsesMessageProcessorMap")
34-
final MessageProcessorMap messageProcessorMap) {
30+
final MessageProcessorMap messageProcessorMap,
31+
@Qualifier("domainSmartMeteringMonitoringService")
32+
final MonitoringService monitoringService) {
3533
super(
3634
responseMessageSender,
3735
messageProcessorMap,
3836
MessageType.GET_ACTUAL_POWER_QUALITY,
3937
ComponentType.DOMAIN_SMART_METERING);
38+
this.monitoringService = monitoringService;
4039
}
4140

4241
@Override

‎osgp/platform/osgp-adapter-domain-smartmetering/src/main/java/org/opensmartgridplatform/adapter/domain/smartmetering/infra/jms/core/messageprocessors/AddMeterResponseMessageProcessor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import org.opensmartgridplatform.shared.infra.jms.ResponseMessage;
1616
import org.slf4j.Logger;
1717
import org.slf4j.LoggerFactory;
18-
import org.springframework.beans.factory.annotation.Autowired;
1918
import org.springframework.beans.factory.annotation.Qualifier;
2019
import org.springframework.stereotype.Component;
2120

@@ -26,18 +25,19 @@ public class AddMeterResponseMessageProcessor extends OsgpCoreResponseMessagePro
2625
private static final Logger LOGGER =
2726
LoggerFactory.getLogger(AddMeterResponseMessageProcessor.class);
2827

29-
@Autowired private InstallationService installationService;
28+
private final InstallationService installationService;
3029

31-
@Autowired
3230
protected AddMeterResponseMessageProcessor(
3331
final WebServiceResponseMessageSender responseMessageSender,
3432
@Qualifier("domainSmartMeteringInboundOsgpCoreResponsesMessageProcessorMap")
35-
final MessageProcessorMap messageProcessorMap) {
33+
final MessageProcessorMap messageProcessorMap,
34+
final InstallationService installationService) {
3635
super(
3736
responseMessageSender,
3837
messageProcessorMap,
3938
MessageType.ADD_METER,
4039
ComponentType.DOMAIN_SMART_METERING);
40+
this.installationService = installationService;
4141
}
4242

4343
@Override

‎osgp/platform/osgp-adapter-domain-smartmetering/src/main/java/org/opensmartgridplatform/adapter/domain/smartmetering/infra/jms/core/messageprocessors/BundleResponseMessageProcessor.java

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,30 +21,28 @@
2121
import org.opensmartgridplatform.shared.infra.jms.MessageProcessorMap;
2222
import org.opensmartgridplatform.shared.infra.jms.MessageType;
2323
import org.opensmartgridplatform.shared.infra.jms.ResponseMessage;
24-
import org.springframework.beans.factory.annotation.Autowired;
2524
import org.springframework.beans.factory.annotation.Qualifier;
2625
import org.springframework.stereotype.Component;
2726

2827
@Slf4j
2928
@Component
3029
public class BundleResponseMessageProcessor extends OsgpCoreResponseMessageProcessor {
3130

32-
@Autowired
33-
@Qualifier("domainSmartMeteringBundleService")
34-
private BundleService bundleService;
31+
private final BundleService bundleService;
3532

3633
private final FaultResponseFactory faultResponseFactory;
3734

38-
@Autowired
3935
public BundleResponseMessageProcessor(
4036
final WebServiceResponseMessageSender responseMessageSender,
4137
@Qualifier("domainSmartMeteringInboundOsgpCoreResponsesMessageProcessorMap")
42-
final MessageProcessorMap messageProcessorMap) {
38+
final MessageProcessorMap messageProcessorMap,
39+
@Qualifier("domainSmartMeteringBundleService") final BundleService bundleService) {
4340
super(
4441
responseMessageSender,
4542
messageProcessorMap,
4643
MessageType.HANDLE_BUNDLED_ACTIONS,
4744
ComponentType.DOMAIN_SMART_METERING);
45+
this.bundleService = bundleService;
4846
this.faultResponseFactory = new FaultResponseFactory();
4947
}
5048

‎osgp/platform/osgp-adapter-domain-smartmetering/src/main/java/org/opensmartgridplatform/adapter/domain/smartmetering/infra/jms/core/messageprocessors/ClearAlarmRegisterResponseMessageProcessor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@
1313
import org.opensmartgridplatform.shared.infra.jms.MessageProcessorMap;
1414
import org.opensmartgridplatform.shared.infra.jms.MessageType;
1515
import org.opensmartgridplatform.shared.infra.jms.ResponseMessage;
16-
import org.springframework.beans.factory.annotation.Autowired;
1716
import org.springframework.beans.factory.annotation.Qualifier;
1817
import org.springframework.stereotype.Component;
1918

2019
@Component
2120
public class ClearAlarmRegisterResponseMessageProcessor extends OsgpCoreResponseMessageProcessor {
2221

23-
@Autowired private MonitoringService monitoringService;
22+
private final MonitoringService monitoringService;
2423

25-
@Autowired
2624
protected ClearAlarmRegisterResponseMessageProcessor(
2725
final WebServiceResponseMessageSender responseMessageSender,
2826
@Qualifier("domainSmartMeteringInboundOsgpCoreResponsesMessageProcessorMap")
29-
final MessageProcessorMap messageProcessorMap) {
27+
final MessageProcessorMap messageProcessorMap,
28+
final MonitoringService monitoringService) {
3029
super(
3130
responseMessageSender,
3231
messageProcessorMap,
3332
MessageType.CLEAR_ALARM_REGISTER,
3433
ComponentType.DOMAIN_SMART_METERING);
34+
this.monitoringService = monitoringService;
3535
}
3636

3737
@Override

‎osgp/platform/osgp-adapter-domain-smartmetering/src/main/java/org/opensmartgridplatform/adapter/domain/smartmetering/infra/jms/core/messageprocessors/ClearMBusStatusOnAllChannelsResponseMessageProcessor.java

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -13,28 +13,27 @@
1313
import org.opensmartgridplatform.shared.infra.jms.MessageProcessorMap;
1414
import org.opensmartgridplatform.shared.infra.jms.MessageType;
1515
import org.opensmartgridplatform.shared.infra.jms.ResponseMessage;
16-
import org.springframework.beans.factory.annotation.Autowired;
1716
import org.springframework.beans.factory.annotation.Qualifier;
1817
import org.springframework.stereotype.Component;
1918

2019
@Component
2120
public class ClearMBusStatusOnAllChannelsResponseMessageProcessor
2221
extends OsgpCoreResponseMessageProcessor {
2322

24-
@Autowired
25-
@Qualifier("domainSmartMeteringManagementService")
26-
private ManagementService managementService;
23+
private final ManagementService managementService;
2724

28-
@Autowired
2925
protected ClearMBusStatusOnAllChannelsResponseMessageProcessor(
3026
final WebServiceResponseMessageSender responseMessageSender,
3127
@Qualifier("domainSmartMeteringInboundOsgpCoreResponsesMessageProcessorMap")
32-
final MessageProcessorMap messageProcessorMap) {
28+
final MessageProcessorMap messageProcessorMap,
29+
@Qualifier("domainSmartMeteringManagementService")
30+
final ManagementService managementService) {
3331
super(
3432
responseMessageSender,
3533
messageProcessorMap,
3634
MessageType.CLEAR_MBUS_STATUS_ON_ALL_CHANNELS,
3735
ComponentType.DOMAIN_SMART_METERING);
36+
this.managementService = managementService;
3837
}
3938

4039
@Override

‎osgp/platform/osgp-adapter-domain-smartmetering/src/main/java/org/opensmartgridplatform/adapter/domain/smartmetering/infra/jms/core/messageprocessors/ConfigureDefinableLoadProfileResponseMessageProcessor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,26 @@
1313
import org.opensmartgridplatform.shared.infra.jms.MessageProcessorMap;
1414
import org.opensmartgridplatform.shared.infra.jms.MessageType;
1515
import org.opensmartgridplatform.shared.infra.jms.ResponseMessage;
16-
import org.springframework.beans.factory.annotation.Autowired;
1716
import org.springframework.beans.factory.annotation.Qualifier;
1817
import org.springframework.stereotype.Component;
1918

2019
@Component
2120
public class ConfigureDefinableLoadProfileResponseMessageProcessor
2221
extends OsgpCoreResponseMessageProcessor {
2322

24-
@Autowired private ConfigurationService configurationService;
23+
private final ConfigurationService configurationService;
2524

26-
@Autowired
2725
protected ConfigureDefinableLoadProfileResponseMessageProcessor(
2826
final WebServiceResponseMessageSender responseMessageSender,
2927
@Qualifier("domainSmartMeteringInboundOsgpCoreResponsesMessageProcessorMap")
30-
final MessageProcessorMap messageProcessorMap) {
28+
final MessageProcessorMap messageProcessorMap,
29+
final ConfigurationService configurationService) {
3130
super(
3231
responseMessageSender,
3332
messageProcessorMap,
3433
MessageType.CONFIGURE_DEFINABLE_LOAD_PROFILE,
3534
ComponentType.DOMAIN_SMART_METERING);
35+
this.configurationService = configurationService;
3636
}
3737

3838
@Override

‎osgp/platform/osgp-adapter-domain-smartmetering/src/main/java/org/opensmartgridplatform/adapter/domain/smartmetering/infra/jms/core/messageprocessors/CoupleMbusDeviceByChannelResponseMessageProcessor.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@
1515
import org.opensmartgridplatform.shared.infra.jms.MessageProcessorMap;
1616
import org.opensmartgridplatform.shared.infra.jms.MessageType;
1717
import org.opensmartgridplatform.shared.infra.jms.ResponseMessage;
18-
import org.springframework.beans.factory.annotation.Autowired;
1918
import org.springframework.beans.factory.annotation.Qualifier;
2019
import org.springframework.stereotype.Component;
2120

2221
@Component
2322
public class CoupleMbusDeviceByChannelResponseMessageProcessor
2423
extends OsgpCoreResponseMessageProcessor {
2524

26-
@Autowired private InstallationService installationService;
25+
private final InstallationService installationService;
2726

28-
@Autowired
2927
protected CoupleMbusDeviceByChannelResponseMessageProcessor(
3028
final WebServiceResponseMessageSender responseMessageSender,
3129
@Qualifier("domainSmartMeteringInboundOsgpCoreResponsesMessageProcessorMap")
32-
final MessageProcessorMap messageProcessorMap) {
30+
final MessageProcessorMap messageProcessorMap,
31+
final InstallationService installationService) {
3332
super(
3433
responseMessageSender,
3534
messageProcessorMap,
3635
MessageType.COUPLE_MBUS_DEVICE_BY_CHANNEL,
3736
ComponentType.DOMAIN_SMART_METERING);
37+
this.installationService = installationService;
3838
}
3939

4040
@Override

0 commit comments

Comments
 (0)