From ee61750a0057844501aab39d2f88b4cecac8e7f9 Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Thu, 18 Aug 2022 09:45:00 +0200 Subject: [PATCH] RED-4897: Remove AMQP queues for pdf2image-service --- .../configuration/MessagingConfiguration.java | 25 -------- .../server/model/Pdf2ImageServiceRequest.java | 27 --------- .../model/Pdf2ImageServiceResponse.java | 27 --------- .../v1/server/service/FileStatusService.java | 27 --------- .../service/Pdf2ImageMessageReceiver.java | 57 ------------------- .../FileManagementServiceSettings.java | 2 - 6 files changed, 165 deletions(-) delete mode 100644 persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/Pdf2ImageServiceRequest.java delete mode 100644 persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/Pdf2ImageServiceResponse.java delete mode 100644 persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/Pdf2ImageMessageReceiver.java diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/configuration/MessagingConfiguration.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/configuration/MessagingConfiguration.java index c34e5e9f9..c0e869bcf 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/configuration/MessagingConfiguration.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/configuration/MessagingConfiguration.java @@ -44,10 +44,6 @@ public class MessagingConfiguration { public static final String PRE_PROCESSING_QUEUE = "preprocessingQueue"; public static final String PRE_PROCESSING_DLQ = "preprocessingDLQ"; - public static final String PDF_2_IMAGE_QUEUE = "pdf2image_request_queue"; - public static final String PDF_2_IMAGE_RESPONSE_QUEUE = "pdf2image_response_queue"; - public static final String PDF_2_IMAGE_DLQ = "pdf2image_dead_letter_queue"; - public static final String PDFTRON_QUEUE = "pdftron_queue"; public static final String PDFTRON_DLQ = "pdftron_dlq"; public static final String PDFTRON_RESULT_QUEUE = "pdftron_result_queue"; @@ -99,27 +95,6 @@ public class MessagingConfiguration { } - @Bean - public Queue pdf2ImageRequestQueue() { - - return QueueBuilder.durable(PDF_2_IMAGE_QUEUE).withArgument("x-dead-letter-exchange", "").withArgument("x-dead-letter-routing-key", PDF_2_IMAGE_DLQ).build(); - } - - - @Bean - public Queue pdf2ImageResponseQueue() { - - return QueueBuilder.durable(PDF_2_IMAGE_RESPONSE_QUEUE).withArgument("x-dead-letter-exchange", "").withArgument("x-dead-letter-routing-key", PDF_2_IMAGE_DLQ).build(); - } - - - @Bean - public Queue pdf2ImageResponseDLQ() { - - return QueueBuilder.durable(PDF_2_IMAGE_DLQ).build(); - } - - @Bean public Queue cvAnalysisRequestQueue() { diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/Pdf2ImageServiceRequest.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/Pdf2ImageServiceRequest.java deleted file mode 100644 index 5d23a0764..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/Pdf2ImageServiceRequest.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.model; - -import java.util.HashSet; -import java.util.Set; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class Pdf2ImageServiceRequest { - - public static final String TARGET_FILE_EXTENSION = "ORIGIN.pdf.gz"; - public static final String OPERATION_CONVERSION = "conversion"; - - private String dossierId; - private String fileId; - private String targetFileExtension; - @Builder.Default - private Set pages = new HashSet<>(); - private String operation; - -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/Pdf2ImageServiceResponse.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/Pdf2ImageServiceResponse.java deleted file mode 100644 index 99bd76d8e..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/model/Pdf2ImageServiceResponse.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.model; - -import java.util.HashSet; -import java.util.Set; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@AllArgsConstructor -@NoArgsConstructor -public class Pdf2ImageServiceResponse { - - public static final String TARGET_FILE_EXTENSION = "ORIGIN.pdf.gz"; - public static final String OPERATION_CONVERSION = "conversion"; - - private String dossierId; - private String fileId; - private String targetFileExtension; - @Builder.Default - private Set pages = new HashSet<>(); - private String operation; - -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java index 69d08bb73..9d4c2ce86 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/FileStatusService.java @@ -22,7 +22,6 @@ import com.iqser.red.service.pdftron.redaction.v1.api.model.ProcessUntouchedDocu import com.iqser.red.service.peristence.v1.server.configuration.MessagingConfiguration; import com.iqser.red.service.peristence.v1.server.model.CvAnalysisServiceRequest; import com.iqser.red.service.peristence.v1.server.model.NerServiceRequest; -import com.iqser.red.service.peristence.v1.server.model.Pdf2ImageServiceRequest; import com.iqser.red.service.peristence.v1.server.model.image.ImageServiceRequest; import com.iqser.red.service.peristence.v1.server.settings.FileManagementServiceSettings; import com.iqser.red.service.peristence.v1.server.utils.FileModelMapper; @@ -134,10 +133,6 @@ public class FileStatusService { fileStatusPersistenceService.updateProcessingStatusPreprocessed(fileId, hasHighlights, fileSize); addToAnalysisQueue(dossierId, fileId, false, Set.of(), false); - if (fileManagementServiceSettings.isPdf2ImageServiceEnabled()) { - addToPdf2ImageQueue(dossierId, fileId, Set.of()); - } - } @@ -417,28 +412,6 @@ public class FileStatusService { } - public void addToPdf2ImageQueue(String dossierId, String fileId, Set pages) { - - try { - rabbitTemplate.convertAndSend( - MessagingConfiguration.PDF_2_IMAGE_QUEUE, - objectMapper.writeValueAsString(Pdf2ImageServiceRequest.builder() - .dossierId(dossierId) - .fileId(fileId) - .targetFileExtension(Pdf2ImageServiceRequest.TARGET_FILE_EXTENSION) - .pages(pages) - .operation(Pdf2ImageServiceRequest.OPERATION_CONVERSION) - .build()), - message -> { - message.getMessageProperties().setPriority(1); - return message; - }); - } catch (JsonProcessingException e) { - throw new RuntimeException(e); - } - } - - public void addToCvAnalysisRequestQueue(String dossierId, String fileId, Set pages) { try { diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/Pdf2ImageMessageReceiver.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/Pdf2ImageMessageReceiver.java deleted file mode 100644 index 7f21d3488..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/Pdf2ImageMessageReceiver.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.iqser.red.service.peristence.v1.server.service; - -import java.io.IOException; -import java.util.HashMap; - -import org.springframework.amqp.core.Message; -import org.springframework.amqp.rabbit.annotation.RabbitListener; -import org.springframework.stereotype.Service; - -import com.fasterxml.jackson.core.type.TypeReference; -import com.fasterxml.jackson.databind.ObjectMapper; -import com.iqser.red.service.peristence.v1.server.configuration.MessagingConfiguration; -import com.iqser.red.service.peristence.v1.server.model.Pdf2ImageServiceResponse; -import com.iqser.red.service.peristence.v1.server.settings.FileManagementServiceSettings; - -import lombok.RequiredArgsConstructor; -import lombok.SneakyThrows; -import lombok.extern.slf4j.Slf4j; - -@Slf4j -@Service -@RequiredArgsConstructor -public class Pdf2ImageMessageReceiver { - - private final ObjectMapper objectMapper; - private final FileStatusService fileStatusService; - private final FileManagementServiceSettings settings; - - - @SneakyThrows - @RabbitListener(queues = MessagingConfiguration.PDF_2_IMAGE_RESPONSE_QUEUE) - public void receive(byte[] in) { - - Pdf2ImageServiceResponse response = objectMapper.readValue(in, Pdf2ImageServiceResponse.class); - - log.debug("{}", response); - - log.info("Received message {} for dossierId {} and fileId {} and pages {}", MessagingConfiguration.PDF_2_IMAGE_RESPONSE_QUEUE, response.getDossierId(), response.getFileId(), response.getPages()); - - if (settings.isCvServiceEnabled()) { - fileStatusService.addToCvAnalysisRequestQueue(response.getDossierId(), response.getFileId(), response.getPages()); - } - } - - - @RabbitListener(queues = MessagingConfiguration.PDF_2_IMAGE_DLQ) - public void handleDLQMessage(Message failedMessage) throws IOException { - - HashMap pdf2ImageResponse = objectMapper.readValue(failedMessage.getBody(), new TypeReference<>() { - }); - String dossierId = (String) pdf2ImageResponse.get("dossierId"); - String fileId = (String) pdf2ImageResponse.get("fileId"); - - log.warn("Received message {} for dossierId {} and fileId {}", MessagingConfiguration.PDF_2_IMAGE_DLQ, dossierId, fileId); - } - -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java index 0edbe5904..c5f19c07a 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/settings/FileManagementServiceSettings.java @@ -28,8 +28,6 @@ public class FileManagementServiceSettings { private boolean migrateOnly; - private boolean pdf2ImageServiceEnabled; - private int maxErrorRetries = 1; private boolean cvServiceEnabled;