From e79bbe058435258a354ee54aa289c14ad0a12733 Mon Sep 17 00:00:00 2001 From: Ali Oezyetimoglu Date: Thu, 26 Oct 2023 16:13:57 +0200 Subject: [PATCH] RED-7679: Changed joining from same table row --- .../server/service/document/ComponentCreationService.java | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java index 59410a83..d96ec04e 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/main/java/com/iqser/red/service/redaction/v1/server/service/document/ComponentCreationService.java @@ -422,11 +422,6 @@ public class ComponentCreationService { } groupedEntities.stream() - .filter(entity -> !(entity.getContainingNode() instanceof TableCell)) - .forEach(entity -> create(ruleIdentifier, name, entity.getValue(), valueDescription, entity)); - - groupedEntities.stream() - .filter(entity -> entity.getContainingNode() instanceof TableCell) .collect(Collectors.groupingBy(entity -> ((TableCell) entity.getContainingNode()).getRow())) .entrySet() .stream() @@ -434,7 +429,7 @@ public class ComponentCreationService { .map(Map.Entry::getValue) .forEach(entitiesInSameRow -> create(ruleIdentifier, name, - entitiesInSameRow.stream().sorted(Comparator.comparing(Entity::getType).reversed()).map(Entity::getValue).collect(Collectors.joining(", ")), + entitiesInSameRow.stream().sorted(EntityComparators.first()).map(Entity::getValue).collect(Collectors.joining(", ")), valueDescription, entitiesInSameRow)); });