diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml b/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
index 2d525be..4e0cad5 100644
--- a/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
+++ b/redaction-report-service-v1/redaction-report-service-api-v1/pom.xml
@@ -17,7 +17,7 @@
com.iqser.red.service
redaction-service-api-v1
- 1.1.1
+ 1.1.3
diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/FileRedactionLog.java b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/FileRedactionLog.java
deleted file mode 100644
index adcffd8..0000000
--- a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/FileRedactionLog.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.iqser.red.service.redaction.report.v1.api.model;
-
-import com.iqser.red.service.redaction.v1.model.RedactionLog;
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-@Data
-@AllArgsConstructor
-@NoArgsConstructor
-public class FileRedactionLog {
-
- private String filename;
- private RedactionLog redactionLog;
-
-}
diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/MultiFileRedactionLog.java b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/MultiFileRedactionLog.java
index 23e0cc1..8d0bac9 100644
--- a/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/MultiFileRedactionLog.java
+++ b/redaction-report-service-v1/redaction-report-service-api-v1/src/main/java/com/iqser/red/service/redaction/report/v1/api/model/MultiFileRedactionLog.java
@@ -3,6 +3,8 @@ package com.iqser.red.service.redaction.report.v1.api.model;
import java.util.ArrayList;
import java.util.List;
+import com.iqser.red.service.redaction.v1.model.RedactionLog;
+
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -12,6 +14,6 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
public class MultiFileRedactionLog {
- private List FileRedactionLogs = new ArrayList<>();
+ private List redactionLogs = new ArrayList<>();
}
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
index cc1a4e7..494a8c4 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/service/ReportGenerationService.java
@@ -46,8 +46,8 @@ public class ReportGenerationService {
XWPFTable table = doc.getTables().get(1);
- multiFileRedactionLog.getFileRedactionLogs().forEach(fileRedactionLog -> {
- fileRedactionLog.getRedactionLog().getRedactionLogEntry().forEach(redactionLogEntry -> {
+ multiFileRedactionLog.getRedactionLogs().forEach(fileRedactionLog -> {
+ fileRedactionLog.getRedactionLogEntry().forEach(redactionLogEntry -> {
Set pages = new HashSet<>();
redactionLogEntry.getPositions().forEach(position -> {
pages.add(position.getPage());
diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java
index 44b1b19..46929a3 100644
--- a/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java
+++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/test/java/com/iqser/red/service/redaction/report/v1/server/RedactionReportIntegrationTest.java
@@ -15,7 +15,6 @@ import org.springframework.core.io.ClassPathResource;
import org.springframework.test.context.junit4.SpringRunner;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.iqser.red.service.redaction.report.v1.api.model.FileRedactionLog;
import com.iqser.red.service.redaction.report.v1.api.model.MultiFileRedactionLog;
import com.iqser.red.service.redaction.report.v1.api.model.ReportResult;
import com.iqser.red.service.redaction.report.v1.server.controller.RedactionReportController;
@@ -39,8 +38,8 @@ public class RedactionReportIntegrationTest {
RedactionLog redactionLog = objectMapper.readValue(redactionLogResource.getInputStream(), RedactionLog.class);
- FileRedactionLog fileRedactionLog = new FileRedactionLog("Metholachlor 1", redactionLog);
- MultiFileRedactionLog multiFileRedactionLog = new MultiFileRedactionLog(List.of(fileRedactionLog));
+ redactionLog.setFilename("TestFile");
+ MultiFileRedactionLog multiFileRedactionLog = new MultiFileRedactionLog(List.of(redactionLog));
ReportResult reportResult = redactionReportController.generateReport(multiFileRedactionLog);