From a76c718be9025a6c9e02b6cff1f52af550d64523 Mon Sep 17 00:00:00 2001
From: maverickstuder <maverick.studer@knecon.com>
Date: Fri, 18 Oct 2024 14:07:21 +0200
Subject: [PATCH] RED-10196: Backend adaptions for RM/DM unification

---
 .../internal/api/queue/LayoutParsingRequest.java            | 4 +++-
 .../layoutparser/processor/LayoutParsingPipeline.java       | 6 ++----
 .../layoutparser/processor/LayoutparserSettings.java        | 1 -
 3 files changed, 5 insertions(+), 6 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 89f98b6..5b27ad8 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
@@ -1,7 +1,9 @@
 package com.knecon.fforesight.service.layoutparser.internal.api.queue;
 
+import java.util.Arrays;
 import java.util.Map;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
@@ -10,7 +12,7 @@ import lombok.NonNull;
 @Builder
 @Schema(description = "Object containing all storage paths the service needs to know.")
 public record LayoutParsingRequest(
-        @Schema(description = "Enum specifying the type of layout parsing to be performed.", allowableValues = "{RedactManager, DocuMine, TAAS}")//
+        @Schema(description = "Enum specifying the type of layout parsing to be performed.") //
         @NonNull LayoutParsingType layoutParsingType,
 
         @Schema(description = "General purpose identifiers. They are not changed by the service at all and are returned as is in the response queue.")//
diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java
index 4d5d4d2..c0ff87d 100644
--- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java
+++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutParsingPipeline.java
@@ -125,8 +125,7 @@ public class LayoutParsingPipeline {
         TableServiceResponse tableServiceResponse = layoutParsingRequest.tablesFileStorageId()
                 .map(layoutParsingStorageService::getTablesFile).orElse(new TableServiceResponse());
 
-        ClassificationDocument classificationDocument = parseLayout(settings.getLayoutParsingTypeOverride() == null //
-                                                                            ? layoutParsingRequest.layoutParsingType() : settings.getLayoutParsingTypeOverride(),
+        ClassificationDocument classificationDocument = parseLayout(layoutParsingRequest.layoutParsingType(),
                                                                     originFile,
                                                                     imageServiceResponse,
                                                                     tableServiceResponse,
@@ -135,8 +134,7 @@ public class LayoutParsingPipeline {
 
         log.info("Building document graph for {}", layoutParsingRequest.identifier());
 
-        Document documentGraph = observeBuildDocumentGraph(settings.getLayoutParsingTypeOverride() == null //
-                                                                   ? layoutParsingRequest.layoutParsingType() : settings.getLayoutParsingTypeOverride(), classificationDocument);
+        Document documentGraph = observeBuildDocumentGraph(layoutParsingRequest.layoutParsingType(), classificationDocument);
 
         log.info("Creating viewer document for {}", layoutParsingRequest.identifier());
 
diff --git a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutparserSettings.java b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutparserSettings.java
index 7eefa33..6a80313 100644
--- a/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutparserSettings.java
+++ b/layoutparser-service/layoutparser-service-processor/src/main/java/com/knecon/fforesight/service/layoutparser/processor/LayoutparserSettings.java
@@ -16,6 +16,5 @@ import lombok.experimental.FieldDefaults;
 public class LayoutparserSettings {
 
     boolean debug;
-    LayoutParsingType layoutParsingTypeOverride;
     String pdftronLicense;
 }