removal of try-catch and rewriting log statements

Author: ORybak5

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/EhrExtractStatusService.java

@@ -440,7 +440,7 @@ private void getEhrExtractStatus(
         Update.AddToSetBuilder updateBuilder,
         FindAndModifyOptions returningUpdatedRecordOption) {
 
-        LOGGER.debug("Attempting to update EHR extract status. Query: {}, Number of documents: {}", query, docs.size());
+        LOGGER.debug("Attempting to update EHR extract status. Number of documents: {}", docs.size());
 
         Update update = updateBuilder.each(docs);
 

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/SendEhrExtractCoreTaskExecutor.java

@@ -157,13 +157,9 @@ private void uploadCompressedEhrExtractToStorageWrapper(
             String taskId,
             String fileName) throws JsonProcessingException {
 
-        LOGGER.info("Preparing to upload compressed EHR extract. File name: {}, Document ID: {}, Task ID: {}, Message ID: {}",
-                 fileName, documentId, taskId, messageId);
+        LOGGER.info("Preparing to upload compressed EHR extract. File name: {}, Message ID: {}", fileName, messageId);
 
-        String data;
-
-        try {
-            data = objectMapper.writeValueAsString(
+        String data = objectMapper.writeValueAsString(
                 OutboundMessage.builder()
                     .payload(
                         ehrDocumentMapper.generateMhsPayload(
@@ -181,10 +177,6 @@ private void uploadCompressedEhrExtractToStorageWrapper(
                                 .payload(compressedEhrExtract)
                                 .build()
                                )).build());
-        } catch (JsonProcessingException exception) {
-            LOGGER.error("Failed to serialize OutboundMessage for document ID: {}", documentId, exception);
-            throw exception;
-        }
 
         storageConnectorService.uploadFile(
             StorageDataWrapperProvider.buildStorageDataWrapper(sendEhrExtractCoreTaskDefinition, data, taskId),