diff --git a/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/settings/OcrServiceSettings.java b/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/settings/OcrServiceSettings.java index be0b772..1f222d7 100644 --- a/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/settings/OcrServiceSettings.java +++ b/ocr-service-v1/ocr-service-processor/src/main/java/com/knecon/fforesight/service/ocr/processor/settings/OcrServiceSettings.java @@ -26,5 +26,4 @@ public class OcrServiceSettings { COSName ocrMarkedContentTag = COSName.getPDFName("KNECON_OCR"); boolean boldDetection = true; // if true, bold detection will be attempted double boldThreshold = 0.5; // Words are opened with a brick of average stroke width, if the ratio of remaining pixels is higher the word is determined bold. - boolean sendStatusUpdates = true; } diff --git a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/NoStatusUpdateOcrMessageSender.java b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/NoStatusUpdateOcrMessageSender.java index 42147f2..911bedd 100644 --- a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/NoStatusUpdateOcrMessageSender.java +++ b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/NoStatusUpdateOcrMessageSender.java @@ -13,7 +13,7 @@ import lombok.experimental.FieldDefaults; @Service @RequiredArgsConstructor @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE) -@ConditionalOnProperty(value = "ocr-service.sendStatusUpdates", havingValue = "false") +@ConditionalOnProperty(value = "ocrService.sendStatusUpdates", havingValue = "false") public class NoStatusUpdateOcrMessageSender implements IOcrMessageSender { RabbitTemplate rabbitTemplate; diff --git a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/OcrMessageReceiver.java b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/OcrMessageReceiver.java index 05fabfe..4c23cfe 100644 --- a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/OcrMessageReceiver.java +++ b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/OcrMessageReceiver.java @@ -16,6 +16,7 @@ import org.springframework.util.FileSystemUtils; import com.fasterxml.jackson.databind.ObjectMapper; import com.knecon.fforesight.service.ocr.processor.service.FileStorageService; +import com.knecon.fforesight.service.ocr.processor.service.IOcrMessageSender; import com.knecon.fforesight.service.ocr.processor.service.OCRService; import com.knecon.fforesight.service.ocr.processor.service.OsUtils; import com.knecon.fforesight.service.ocr.v1.api.model.DocumentRequest; @@ -27,14 +28,13 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Service @RequiredArgsConstructor -@ConditionalOnProperty(value = "ocr-service.sendStatusUpdates", havingValue = "true") @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE) public class OcrMessageReceiver { FileStorageService fileStorageService; ObjectMapper objectMapper; OCRService ocrService; - OcrMessageSender ocrMessageSender; + IOcrMessageSender ocrMessageSender; @RabbitHandler diff --git a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/OcrMessageSender.java b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/OcrMessageSender.java index 92f4e3d..e9c51ff 100644 --- a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/OcrMessageSender.java +++ b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/OcrMessageSender.java @@ -1,23 +1,32 @@ package com.knecon.fforesight.service.ocr.v1.server.queue; import org.springframework.amqp.rabbit.core.RabbitTemplate; +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.stereotype.Service; import com.knecon.fforesight.service.ocr.processor.service.IOcrMessageSender; import com.knecon.fforesight.service.ocr.v1.api.model.DocumentRequest; import com.knecon.fforesight.service.ocr.v1.api.model.OCRStatusUpdateResponse; +import jakarta.annotation.PostConstruct; import lombok.AccessLevel; import lombok.RequiredArgsConstructor; import lombok.experimental.FieldDefaults; +import lombok.extern.slf4j.Slf4j; +@Slf4j @Service @RequiredArgsConstructor +@ConditionalOnProperty(value = "ocrService.sendStatusUpdates", havingValue = "true") @FieldDefaults(makeFinal = true, level = AccessLevel.PRIVATE) public class OcrMessageSender implements IOcrMessageSender { RabbitTemplate rabbitTemplate; + @PostConstruct + protected void pc(){ + log.error("PC"); + } public void sendOcrFinished(String fileId, int totalImages) { rabbitTemplate.convertAndSend(MessagingConfiguration.OCR_STATUS_UPDATE_RESPONSE_QUEUE, diff --git a/ocr-service-v1/ocr-service-server/src/main/resources/application.yml b/ocr-service-v1/ocr-service-server/src/main/resources/application.yml index b7c8893..33ff53e 100644 --- a/ocr-service-v1/ocr-service-server/src/main/resources/application.yml +++ b/ocr-service-v1/ocr-service-server/src/main/resources/application.yml @@ -57,3 +57,6 @@ management: endpoint: ${OTLP_ENDPOINT:http://otel-collector-opentelemetry-collector.otel-collector:4318/v1/traces} pdftron.license: ${PDFTRON_LICENSE} + +ocrService: + sendStatusUpdates: true