SMHE-1602: Add devicemodelcode to MessageMetadata for the protocol ad…

…apter Signed-off-by: Andre Bolder <[email protected]>
OSGP · Oct 23, 2023 · 72d14a1 · 72d14a1
1 parent ea857bb
commit 72d14a1
Show file tree

Hide file tree

Showing 12 changed files with 339 additions and 294 deletions.
diff --git a/...opensmartgridplatform/adapter/domain/smartmetering/application/services/AdhocService.java b/...opensmartgridplatform/adapter/domain/smartmetering/application/services/AdhocService.java
@@ -4,6 +4,8 @@
 
 package org.opensmartgridplatform.adapter.domain.smartmetering.application.services;
 
+import static org.opensmartgridplatform.adapter.domain.smartmetering.application.services.utils.MessageMetadataUtil.*;
+
 import java.io.Serializable;
 import lombok.extern.slf4j.Slf4j;
 import ma.glasnost.orika.MapperFactory;
@@ -79,13 +81,7 @@ public void synchronizeTime(
             .getMapperFacade()
             .map(synchronizeTimeRequestData, SynchronizeTimeRequestDto.class);
 
-    this.osgpCoreRequestMessageSender.send(
-        requestDto,
-        messageMetadata
-            .builder()
-            .withNetworkAddress(smartMeter.getNetworkAddress())
-            .withNetworkSegmentIds(smartMeter.getBtsId(), smartMeter.getCellId())
-            .build());
+    this.osgpCoreRequestMessageSender.send(requestDto, buildMetadata(messageMetadata, smartMeter));
   }
 
   public void scheduleTestAlarm(
@@ -106,13 +102,7 @@ public void scheduleTestAlarm(
             .getMapperFacade()
             .map(testAlarmSchedulerRequestData, TestAlarmSchedulerRequestDto.class);
 
-    this.osgpCoreRequestMessageSender.send(
-        requestDto,
-        messageMetadata
-            .builder()
-            .withNetworkAddress(smartMeter.getNetworkAddress())
-            .withNetworkSegmentIds(smartMeter.getBtsId(), smartMeter.getCellId())
-            .build());
+    this.osgpCoreRequestMessageSender.send(requestDto, buildMetadata(messageMetadata, smartMeter));
   }
 
   public void handleSynchronizeTimeResponse(
@@ -141,13 +131,7 @@ public void getAllAttributeValues(final MessageMetadata messageMetadata)
 
     final GetAllAttributeValuesRequestDto requestDto = new GetAllAttributeValuesRequestDto();
 
-    this.osgpCoreRequestMessageSender.send(
-        requestDto,
-        messageMetadata
-            .builder()
-            .withNetworkAddress(smartMeter.getNetworkAddress())
-            .withNetworkSegmentIds(smartMeter.getBtsId(), smartMeter.getCellId())
-            .build());
+    this.osgpCoreRequestMessageSender.send(requestDto, buildMetadata(messageMetadata, smartMeter));
   }
 
   public void handleGetAllAttributeValuesResponse(
@@ -179,13 +163,7 @@ public void getAssociationLnObjects(final MessageMetadata messageMetadata)
 
     final GetAssociationLnObjectsRequestDto requestDto = new GetAssociationLnObjectsRequestDto();
 
-    this.osgpCoreRequestMessageSender.send(
-        requestDto,
-        messageMetadata
-            .builder()
-            .withNetworkAddress(smartMeter.getNetworkAddress())
-            .withNetworkSegmentIds(smartMeter.getBtsId(), smartMeter.getCellId())
-            .build());
+    this.osgpCoreRequestMessageSender.send(requestDto, buildMetadata(messageMetadata, smartMeter));
   }
 
   public void handleGetAssocationLnObjectsResponse(
@@ -223,13 +201,7 @@ public void getSpecificAttributeValue(
                 .getMapperFacade()
                 .map(request.getObisCode(), ObisCodeValuesDto.class));
 
-    this.osgpCoreRequestMessageSender.send(
-        requestDto,
-        messageMetadata
-            .builder()
-            .withNetworkAddress(smartMeter.getNetworkAddress())
-            .withNetworkSegmentIds(smartMeter.getBtsId(), smartMeter.getCellId())
-            .build());
+    this.osgpCoreRequestMessageSender.send(requestDto, buildMetadata(messageMetadata, smartMeter));
   }
 
   public void handleGetSpecificAttributeValueResponse(
@@ -260,13 +232,7 @@ public void scanMbusChannels(final MessageMetadata messageMetadata) throws Funct
 
     final ScanMbusChannelsRequestDataDto requestDto = new ScanMbusChannelsRequestDataDto();
 
-    this.osgpCoreRequestMessageSender.send(
-        requestDto,
-        messageMetadata
-            .builder()
-            .withNetworkAddress(smartMeter.getNetworkAddress())
-            .withNetworkSegmentIds(smartMeter.getBtsId(), smartMeter.getCellId())
-            .build());
+    this.osgpCoreRequestMessageSender.send(requestDto, buildMetadata(messageMetadata, smartMeter));
   }
 
   public void handleScanMbusChannelsResponse(

diff --git a/...pensmartgridplatform/adapter/domain/smartmetering/application/services/BundleService.java b/...pensmartgridplatform/adapter/domain/smartmetering/application/services/BundleService.java
@@ -4,6 +4,8 @@
 
 package org.opensmartgridplatform.adapter.domain.smartmetering.application.services;
 
+import static org.opensmartgridplatform.adapter.domain.smartmetering.application.services.utils.MessageMetadataUtil.buildMetadata;
+
 import java.util.Arrays;
 import java.util.List;
 import org.opensmartgridplatform.adapter.domain.smartmetering.application.mapping.ConfigurationMapper;
@@ -86,13 +88,7 @@ public void handleBundle(
 
     LOGGER.info("Sending request message to core.");
 
-    this.osgpCoreRequestMessageSender.send(
-        requestDto,
-        messageMetadata
-            .builder()
-            .withNetworkAddress(smartMeter.getNetworkAddress())
-            .withNetworkSegmentIds(smartMeter.getBtsId(), smartMeter.getCellId())
-            .build());
+    this.osgpCoreRequestMessageSender.send(requestDto, buildMetadata(messageMetadata, smartMeter));
   }
 
   @Transactional(value = "transactionManager")