From ec04a902d528135fc71f2c40401ac896e23f7ec7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kilian=20Sch=C3=BCttler?= Date: Tue, 5 Mar 2024 16:58:12 +0100 Subject: [PATCH] Image name backport --- .../v1/server/model/document/nodes/Image.java | 7 +++++-- .../v1/server/model/document/nodes/ImageType.java | 14 +------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Image.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Image.java index e591af11..0a3243fb 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Image.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/Image.java @@ -70,7 +70,9 @@ public class Image implements GenericSemanticNode, IEntity { @Override public TextBlock getTextBlock() { - return streamAllSubNodes().filter(SemanticNode::isLeaf).map(SemanticNode::getLeafTextBlock).collect(new TextBlockCollector()); + return streamAllSubNodes().filter(SemanticNode::isLeaf) + .map(SemanticNode::getLeafTextBlock) + .collect(new TextBlockCollector()); } @@ -91,7 +93,8 @@ public class Image implements GenericSemanticNode, IEntity { @Override public String type() { - return getManualOverwrite().getType().orElse(imageType.toString()); + return getManualOverwrite().getType() + .orElse(imageType.toString().toLowerCase(Locale.ENGLISH)); } diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/ImageType.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/ImageType.java index e5e025f0..397d7b11 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/ImageType.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/model/document/nodes/ImageType.java @@ -6,22 +6,10 @@ public enum ImageType { LOGO, FORMULA, SIGNATURE, - OTHER { - @Override - public String toString() { - - return "image"; - } - }, + OTHER, OCR; - public String toString() { - - return name().toLowerCase(Locale.ENGLISH); - } - - public static ImageType fromString(String imageType) { return switch (imageType.toLowerCase(Locale.ROOT)) {