diff --git a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/annotate/AnnotationService.java b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/annotate/AnnotationService.java index c46aaf75..3a767021 100644 --- a/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/annotate/AnnotationService.java +++ b/redaction-service-v1/redaction-service-server-v1/src/test/java/com/iqser/red/service/redaction/v1/server/annotate/AnnotationService.java @@ -123,16 +123,16 @@ public class AnnotationService { if (entry.getState().equals(EntryState.REMOVED)) { continue; } - annotations.addAll(createAnnotation(entry, page, pdPage.getRotation(), pdPage.getCropBox())); + annotations.addAll(createAnnotation(entry, page)); } } - private List createAnnotation(EntityLogEntry redactionLogEntry, int page, int rotation, PDRectangle cropBox) { + private List createAnnotation(EntityLogEntry entityLogEntry, int page) { List annotations = new ArrayList<>(); - List rectangles = redactionLogEntry.getPositions().stream().filter(pos -> pos.getPageNumber() == page).collect(Collectors.toList()); + List rectangles = entityLogEntry.getPositions().stream().filter(pos -> pos.getPageNumber() == page).collect(Collectors.toList()); if (rectangles.isEmpty()) { return annotations; @@ -143,12 +143,12 @@ public class AnnotationService { PDRectangle pdRectangle = toPDRectangleBBox(rectangles); annotation.setRectangle(pdRectangle); annotation.setQuadPoints(Floats.toArray(toQuadPoints(rectangles))); - if (!(redactionLogEntry.getEntryType().equals(EntryType.HINT) || redactionLogEntry.getState().equals(EntryState.IGNORED))) { - annotation.setContents(redactionLogEntry.getValue() + " " + createAnnotationContent(redactionLogEntry)); + if (!(entityLogEntry.getEntryType() == null || entityLogEntry.getEntryType().equals(EntryType.HINT) || entityLogEntry.getState().equals(EntryState.IGNORED))) { + annotation.setContents(entityLogEntry.getValue() + " " + createAnnotationContent(entityLogEntry)); } - annotation.setTitlePopup(redactionLogEntry.getId()); - annotation.setAnnotationName(redactionLogEntry.getId()); - annotation.setColor(new PDColor(redactionLogEntry.getColor(), PDDeviceRGB.INSTANCE)); + annotation.setTitlePopup(entityLogEntry.getId()); + annotation.setAnnotationName(entityLogEntry.getId()); + annotation.setColor(new PDColor(entityLogEntry.getColor(), PDDeviceRGB.INSTANCE)); annotation.setNoRotate(false); annotations.add(annotation);