From ded00df11e68dbefb5c8af884cd4a1320fd373e5 Mon Sep 17 00:00:00 2001 From: Kilian Schuettler Date: Tue, 1 Aug 2023 09:57:58 +0200 Subject: [PATCH] fix build --- .../api/queue/LayoutParsingRequest.java | 2 +- .../server/queue/MessageHandler.java | 4 +++ .../server/utils/AbstractTest.java | 32 +++++++++++++------ 3 files changed, 27 insertions(+), 11 deletions(-) diff --git a/layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/queue/LayoutParsingRequest.java b/layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/queue/LayoutParsingRequest.java index e067b60..aff1eae 100644 --- a/layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/queue/LayoutParsingRequest.java +++ b/layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/queue/LayoutParsingRequest.java @@ -14,7 +14,7 @@ public record LayoutParsingRequest( Optional tablesFileStorageId, Optional imagesFileStorageId, @NonNull String structureFileStorageId, - @NonNull String researchDocumentStorageId, + String researchDocumentStorageId, @NonNull String textBlockFileStorageId, @NonNull String positionBlockFileStorageId, @NonNull String pageFileStorageId, diff --git a/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/queue/MessageHandler.java b/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/queue/MessageHandler.java index 3f89dd8..2e58f2f 100644 --- a/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/queue/MessageHandler.java +++ b/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/queue/MessageHandler.java @@ -11,6 +11,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingFinishedEvent; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingQueueNames; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest; +import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType; import com.knecon.fforesight.service.layoutparser.processor.LayoutParsingPipeline; import lombok.RequiredArgsConstructor; @@ -34,6 +35,9 @@ public class MessageHandler { LayoutParsingRequest layoutParsingRequest = objectMapper.readValue(message.getBody(), LayoutParsingRequest.class); + if (layoutParsingRequest.layoutParsingType().equals(LayoutParsingType.TAAS) && layoutParsingRequest.researchDocumentStorageId() == null) { + throw new IllegalArgumentException("ResearchDocumentDataStorageId is null!"); + } log.info("Layout parsing request received {}", layoutParsingRequest.identifier()); if (message.getMessageProperties().isRedelivered()) { throw new AmqpRejectAndDontRequeueException(String.format("Error during last layout parsing of request with identifier: %s, do not retry.", diff --git a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/AbstractTest.java b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/AbstractTest.java index e753298..cba516e 100644 --- a/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/AbstractTest.java +++ b/layoutparser-service/layoutparser-service-server/src/test/java/com/knecon/fforesight/service/layoutparser/server/utils/AbstractTest.java @@ -20,6 +20,7 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; import com.iqser.red.storage.commons.service.StorageService; import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingRequest; +import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsingType; import com.knecon.fforesight.service.layoutparser.processor.LayoutParsingStorageService; import com.knecon.fforesight.service.layoutparser.server.Application; import com.knecon.fforesight.tenantcommons.TenantContext; @@ -52,18 +53,23 @@ public abstract class AbstractTest { protected final static String POSITION_FILE_ID = "positions"; protected final static String PAGES_FILE_ID = "pages"; protected final static String TENANT_ID = "tenant"; + protected final static String SECTION_GRID_ID = "section"; + protected final static String SIMPLIFIED_ID = "simplified"; protected LayoutParsingRequest buildStandardLayoutParsingRequest() { return LayoutParsingRequest.builder() - .imagesFileStorageId(Optional.of(IMAGE_FILE_ID)) + .layoutParsingType(LayoutParsingType.REDACT_MANAGER) .originFileStorageId(ORIGIN_FILE_ID) .tablesFileStorageId(Optional.of(TABLE_FILE_ID)) - .pageFileStorageId(PAGES_FILE_ID) - .positionBlockFileStorageId(POSITION_FILE_ID) + .imagesFileStorageId(Optional.of(IMAGE_FILE_ID)) .structureFileStorageId(STRUCTURE_FILE_ID) .textBlockFileStorageId(TEXT_FILE_ID) + .positionBlockFileStorageId(POSITION_FILE_ID) + .pageFileStorageId(PAGES_FILE_ID) + .simplifiedTextStorageId(SIMPLIFIED_ID) + .sectionGridStorageId(SECTION_GRID_ID) .build(); } @@ -94,13 +100,16 @@ public abstract class AbstractTest { storageService.storeObject(TenantContext.getTenantId(), ORIGIN_FILE_ID, fileInputStream); return LayoutParsingRequest.builder() - .imagesFileStorageId(Optional.empty()) + .layoutParsingType(LayoutParsingType.REDACT_MANAGER) .originFileStorageId(ORIGIN_FILE_ID) - .tablesFileStorageId(Optional.empty()) - .pageFileStorageId(PAGES_FILE_ID) - .positionBlockFileStorageId(POSITION_FILE_ID) + .tablesFileStorageId(Optional.of(TABLE_FILE_ID)) + .imagesFileStorageId(Optional.of(IMAGE_FILE_ID)) .structureFileStorageId(STRUCTURE_FILE_ID) .textBlockFileStorageId(TEXT_FILE_ID) + .positionBlockFileStorageId(POSITION_FILE_ID) + .pageFileStorageId(PAGES_FILE_ID) + .simplifiedTextStorageId(SIMPLIFIED_ID) + .sectionGridStorageId(SECTION_GRID_ID) .build(); } @@ -124,13 +133,16 @@ public abstract class AbstractTest { storageService.storeObject(TenantContext.getTenantId(), ORIGIN_FILE_ID, fileStream); return LayoutParsingRequest.builder() - .imagesFileStorageId(Optional.of(IMAGE_FILE_ID)) + .layoutParsingType(LayoutParsingType.REDACT_MANAGER) .originFileStorageId(ORIGIN_FILE_ID) .tablesFileStorageId(Optional.of(TABLE_FILE_ID)) - .pageFileStorageId(PAGES_FILE_ID) - .positionBlockFileStorageId(POSITION_FILE_ID) + .imagesFileStorageId(Optional.of(IMAGE_FILE_ID)) .structureFileStorageId(STRUCTURE_FILE_ID) .textBlockFileStorageId(TEXT_FILE_ID) + .positionBlockFileStorageId(POSITION_FILE_ID) + .pageFileStorageId(PAGES_FILE_ID) + .simplifiedTextStorageId(SIMPLIFIED_ID) + .sectionGridStorageId(SECTION_GRID_ID) .build(); }