Marmelator/redaction-report-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 129 Wiki Activity

correction

Browse Source
This commit is contained in:
Timo Bejan 2022-01-27 17:17:47 +02:00
parent 7b080b3b48
commit fc8ce6ea5c
3 changed files with 12 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
View File

@ -13,6 +13,10 @@
<artifactId>redaction-report-service-api-v1</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
<persistence-service.version>1.25.0</persistence-service.version>
</properties>
<dependencies>
<dependency>
<!-- This dependency contains annotations that are used in specifying REST endpoints. -->
@ -29,8 +33,7 @@
<dependency>
<groupId>com.iqser.red.service</groupId>
<artifactId>persistence-service-api-v1</artifactId>
<version>0.151.0</version>
<scope>compile</scope>
<version>${persistence-service.version}</version>
</dependency>
</dependencies>
</project>

19
redaction-report-service-v1/redaction-report-service-server-v1/pom.xml
View File

@ -13,6 +13,11 @@
<artifactId>redaction-report-service-server-v1</artifactId>
<version>1.0-SNAPSHOT</version>
<properties>
<persistence-service.version>1.25.0</persistence-service.version>
<redaction-service.version>3.68.0</redaction-service.version>
</properties>
<dependencies>
<dependency>
<groupId>com.iqser.red.service</groupId>
@ -24,7 +29,7 @@
<dependency>
<groupId>com.iqser.red.service</groupId>
<artifactId>redaction-service-api-v1</artifactId>
<version>3.21.0</version>
<version>${redaction-service.version}</version>
<exclusions>
<exclusion>
<groupId>com.iqser.red.service</groupId>
@ -33,18 +38,6 @@
</exclusions>
</dependency>
<dependency>
<groupId>com.iqser.red.service</groupId>
<artifactId>persistence-service-api-v1</artifactId>
<version>0.83.0</version>
<exclusions>
<exclusion>
<groupId>com.iqser.red.service</groupId>
<artifactId>redaction-service-api-v1</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>

15
redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/RedactionLogConverterService.java
View File

@ -30,10 +30,7 @@ public class RedactionLogConverterService {
if (entry.isRedacted()) {
if (entry.getChanges() != null && entry.getChanges().size() > 1 && entry.getChanges()
.get(entry.getChanges().size() - 1)
.getType()
.equals(ChangeType.REMOVED)) {
if(entry.lastChangeIsRemoved()){
return;
}
@ -45,16 +42,6 @@ public class RedactionLogConverterService {
return;
}
if (entry.isManual() && entry.getManualRedactionType()
.equals(ManualRedactionType.ADD) && !entry.getStatus().equals(AnnotationStatus.APPROVED)) {
return;
}
if (entry.isManual() && entry.getManualRedactionType()
.equals(ManualRedactionType.REMOVE) && entry.getStatus().equals(AnnotationStatus.APPROVED)) {
return;
}
Set<Integer> pages = new HashSet<>();
for (Rectangle position : entry.getPositions()) {