Pull request #554: RED-5232: Formatted service with latest styleguide

Merge in RED/persistence-service from RED-5232 to master

* commit '6a763e0575587665c7006ae6ace52c99f44fd83d':
  RED-5232: Formatted service with latest styleguide

CHANGELOG.md

@@ -1,4 +1,5 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
 ## [Unreleased]

bamboo-specs/src/main/java/buildjob/PlanSpec.java

@@ -40,6 +40,7 @@ public class PlanSpec {
 
     private static final String SERVICE_KEY = SERVICE_NAME.toUpperCase().replaceAll("-", "");
 
+
     /**
      * Run main to publish plan on Bamboo
      */
@@ -58,10 +59,15 @@ public class PlanSpec {
         bambooServer.publish(secPlanPermission);
     }
 
+
     private PlanPermissions createPlanPermission(PlanIdentifier planIdentifier) {
 
-        Permissions permission = new Permissions()
-                .userPermissions("atlbamboo", PermissionType.EDIT, PermissionType.VIEW, PermissionType.ADMIN, PermissionType.CLONE, PermissionType.BUILD)
+        Permissions permission = new Permissions().userPermissions("atlbamboo",
+                        PermissionType.EDIT,
+                        PermissionType.VIEW,
+                        PermissionType.ADMIN,
+                        PermissionType.CLONE,
+                        PermissionType.BUILD)
                 .groupPermissions("development", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
                 .groupPermissions("devplant", PermissionType.EDIT, PermissionType.VIEW, PermissionType.CLONE, PermissionType.BUILD)
                 .loggedInUserPermissions(PermissionType.VIEW)
@@ -69,90 +75,52 @@ public class PlanSpec {
         return new PlanPermissions(planIdentifier.getProjectKey(), planIdentifier.getPlanKey()).permissions(permission);
     }
 
+
     private Project project() {
 
-        return new Project()
-                .name("RED")
-                .key(new BambooKey("RED"));
+        return new Project().name("RED").key(new BambooKey("RED"));
     }
 
+
     public Plan createPlanBuild() {
-        return new Plan(project(), SERVICE_NAME, new BambooKey(SERVICE_KEY)).description("Build Plan for Persitence Service").variables(new Variable("maven_add_param", ""))
-                .stages(new Stage("Default Stage")
-                        .jobs(new Job("Default Job",
-                                new BambooKey("JOB1"))
-                                .tasks(
-                                        new ScriptTask()
-                                                .description("Clean")
-                                                .inlineBody("#!/bin/bash\n" +
-                                                        "set -e\n" +
-                                                        "rm -rf ./*"), new VcsCheckoutTask().description("Checkout Default Repository").cleanCheckout(true)
-                                                .checkoutItems(new CheckoutItem().defaultRepository()),
-                                        new ScriptTask()
-                                                .description("Build")
-                                                .location(Location.FILE)
-                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh")
-                                                .argument(SERVICE_NAME),
-                                        createJUnitParserTask()
-                                                .description("Resultparser")
-                                                .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
-                                                .enabled(true),
-                                        new InjectVariablesTask()
-                                                .description("Inject git Tag")
-                                                .path("git.tag")
-                                                .namespace("g")
-                                                .scope(InjectVariablesScope.LOCAL),
-                                        new VcsTagTask()
-                                                .description("${bamboo.g.gitTag}")
-                                                .tagName("${bamboo.g.gitTag}")
-                                                .defaultRepository())
-                                .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
-                                                .dockerRunArguments("--net=host")
-                                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
-                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
-                                )
-                        )
-                )
+
+        return new Plan(project(), SERVICE_NAME, new BambooKey(SERVICE_KEY)).description("Build Plan for Persitence Service")
+                .variables(new Variable("maven_add_param", ""))
+                .stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new ScriptTask().description("Clean")
+                                        .inlineBody("#!/bin/bash\n" + "set -e\n" + "rm -rf ./*"),
+                                new VcsCheckoutTask().description("Checkout Default Repository").cleanCheckout(true).checkoutItems(new CheckoutItem().defaultRepository()),
+                                new ScriptTask().description("Build").location(Location.FILE).fileFromPath("bamboo-specs/src/main/resources/scripts/build-java.sh").argument(SERVICE_NAME),
+                                createJUnitParserTask().description("Resultparser")
+                                        .resultDirectories("**/test-reports/*.xml, **/target/surefire-reports/*.xml, **/target/failsafe-reports/*.xml")
+                                        .enabled(true),
+                                new InjectVariablesTask().description("Inject git Tag").path("git.tag").namespace("g").scope(InjectVariablesScope.LOCAL),
+                                new VcsTagTask().description("${bamboo.g.gitTag}").tagName("${bamboo.g.gitTag}").defaultRepository())
+                        .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
+                                .dockerRunArguments("--net=host")
+                                .volume("/etc/maven/settings.xml", "/usr/share/maven/ref/settings.xml")
+                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
                 .linkedRepositories("RED / " + SERVICE_NAME)
                 .triggers(new BitbucketServerTrigger())
-                .planBranchManagement(new PlanBranchManagement()
-                        .createForVcsBranch()
-                        .delete(new BranchCleanup()
-                                .whenInactiveInRepositoryAfterDays(14))
+                .planBranchManagement(new PlanBranchManagement().createForVcsBranch()
+                        .delete(new BranchCleanup().whenInactiveInRepositoryAfterDays(14))
                         .notificationForCommitters());
     }
 
+
     public Plan createSecBuild() {
-        return new Plan(
-                project(),
-                SERVICE_NAME + "-Sec", new BambooKey(SERVICE_KEY + "SEC"))
-                .description("Security Analysis Plan")
-                .stages(new Stage("Default Stage")
-                        .jobs(new Job("Default Job",
-                                new BambooKey("JOB1"))
-                                .tasks(
-                                        new ScriptTask()
-                                                .description("Clean")
-                                                .inlineBody("#!/bin/bash\n" +
-                                                        "set -e\n" +
-                                                        "rm -rf ./*"), new VcsCheckoutTask().description("Checkout Default Repository").cleanCheckout(true)
-                                                .checkoutItems(new CheckoutItem().defaultRepository()),
-                                        new ScriptTask()
-                                                .description("Sonar")
-                                                .location(Location.FILE)
-                                                .fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh")
-                                                .argument(SERVICE_NAME))
-                                .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
-                                        .dockerRunArguments("--net=host")
-                                        .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml")
-                                                .volume("/var/run/docker.sock", "/var/run/docker.sock")
-                                )
-                        )
-                )
+
+        return new Plan(project(), SERVICE_NAME + "-Sec", new BambooKey(SERVICE_KEY + "SEC")).description("Security Analysis Plan")
+                .stages(new Stage("Default Stage").jobs(new Job("Default Job", new BambooKey("JOB1")).tasks(new ScriptTask().description("Clean")
+                                        .inlineBody("#!/bin/bash\n" + "set -e\n" + "rm -rf ./*"),
+                                new VcsCheckoutTask().description("Checkout Default Repository").cleanCheckout(true).checkoutItems(new CheckoutItem().defaultRepository()),
+                                new ScriptTask().description("Sonar").location(Location.FILE).fileFromPath("bamboo-specs/src/main/resources/scripts/sonar-java.sh").argument(SERVICE_NAME))
+                        .dockerConfiguration(new DockerConfiguration().image("nexus.iqser.com:5001/infra/maven:3.8.4-openjdk-17-slim")
+                                .dockerRunArguments("--net=host")
+                                .volume("/etc/maven/settings.xml", "/usr/share/maven/conf/settings.xml")
+                                .volume("/var/run/docker.sock", "/var/run/docker.sock"))))
                 .linkedRepositories("RED / " + SERVICE_NAME)
                 .triggers(new ScheduledTrigger().scheduleOnceDaily(LocalTime.of(23, 00)))
-                .planBranchManagement(new PlanBranchManagement()
-                        .createForVcsBranchMatching("release.*")
-                        .notificationForCommitters());
+                .planBranchManagement(new PlanBranchManagement().createForVcsBranchMatching("release.*").notificationForCommitters());
     }
+
 }

bamboo-specs/src/test/java/buildjob/PlanSpecTest.java

@@ -1,6 +1,5 @@
 package buildjob;
 
-
 import org.junit.Test;
 
 import com.atlassian.bamboo.specs.api.builders.plan.Plan;
@@ -8,12 +7,15 @@ import com.atlassian.bamboo.specs.api.exceptions.PropertiesValidationException;
 import com.atlassian.bamboo.specs.api.util.EntityPropertiesBuilders;
 
 public class PlanSpecTest {
+
     @Test
     public void checkYourPlanOffline() throws PropertiesValidationException {
+
         Plan buildPlan = new PlanSpec().createPlanBuild();
         EntityPropertiesBuilders.build(buildPlan);
 
         Plan secPlan = new PlanSpec().createSecBuild();
         EntityPropertiesBuilders.build(secPlan);
     }
+
 }

persistence-service-image-v1/pom.xml

@@ -6,7 +6,7 @@
         <groupId>com.iqser.red</groupId>
         <artifactId>platform-docker-dependency</artifactId>
         <version>1.2.0</version>
-        <relativePath />
+        <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/AddRedactionRequest.java

@@ -1,15 +1,15 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.util.ArrayList;
 import java.util.List;
 
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntryType;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 @Data
 @Builder
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/Comment.java

@@ -1,13 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
+import java.time.OffsetDateTime;
+
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.OffsetDateTime;
-
 @Data
 @Builder
 @AllArgsConstructor
@@ -22,4 +23,5 @@ public class Comment {
     private String user;
     private OffsetDateTime softDeletedTime;
     private FileModel fileStatus;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualAddResponse.java

@@ -13,4 +13,5 @@ public class ManualAddResponse {
 
     private String annotationId;
     private Long commentId;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ManualRedactions.java

@@ -1,13 +1,23 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.IdRemoval;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualForceRedaction;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualImageRecategorization;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualLegalBasisChange;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualRedactionEntry;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped.ManualResizeRedaction;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.*;
-
 @Data
 @Builder
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/Rectangle.java

@@ -11,7 +11,6 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class Rectangle {
 
-
     private float topLeftX;
 
     private float topLeftY;

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/UpdateRedactionRequest.java

@@ -1,17 +1,19 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.List;
-
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor
 public class UpdateRedactionRequest {
+
     private List<String> annotationIds;
     private AnnotationStatus annotationStatus;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/ViewedPage.java

@@ -1,11 +1,11 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations;
 
+import java.time.OffsetDateTime;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.OffsetDateTime;
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/BaseAnnotation.java

@@ -1,13 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped;
 
+import java.time.OffsetDateTime;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.time.OffsetDateTime;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -21,4 +22,5 @@ public class BaseAnnotation {
     private OffsetDateTime requestDate;
     private OffsetDateTime processedDate;
     private OffsetDateTime softDeletedTime;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/IdRemoval.java

@@ -1,13 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped;
 
+import java.time.OffsetDateTime;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.time.OffsetDateTime;
-
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
@@ -15,11 +16,17 @@ public class IdRemoval extends BaseAnnotation {
 
     private boolean removeFromDictionary;
 
+
     @Builder
-    public IdRemoval(String annotationId, String fileId,
-                     String user, AnnotationStatus status,
-                     OffsetDateTime requestDate, OffsetDateTime processedDate,
-                     OffsetDateTime softDeletedTime, boolean removeFromDictionary) {
+    public IdRemoval(String annotationId,
+                     String fileId,
+                     String user,
+                     AnnotationStatus status,
+                     OffsetDateTime requestDate,
+                     OffsetDateTime processedDate,
+                     OffsetDateTime softDeletedTime,
+                     boolean removeFromDictionary) {
+
         super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
         this.removeFromDictionary = removeFromDictionary;
     }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualForceRedaction.java

@@ -1,13 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped;
 
+import java.time.OffsetDateTime;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.time.OffsetDateTime;
-
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
@@ -15,11 +16,17 @@ public class ManualForceRedaction extends BaseAnnotation {
 
     private String legalBasis;
 
+
     @Builder
-    public ManualForceRedaction(String annotationId, String fileId,
-                                String user, AnnotationStatus status,
-                                OffsetDateTime requestDate, OffsetDateTime processedDate,
-                                OffsetDateTime softDeletedTime, String legalBasis) {
+    public ManualForceRedaction(String annotationId,
+                                String fileId,
+                                String user,
+                                AnnotationStatus status,
+                                OffsetDateTime requestDate,
+                                OffsetDateTime processedDate,
+                                OffsetDateTime softDeletedTime,
+                                String legalBasis) {
+
         super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
         this.legalBasis = legalBasis;
     }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualImageRecategorization.java

@@ -1,13 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped;
 
+import java.time.OffsetDateTime;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.time.OffsetDateTime;
-
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
@@ -15,11 +16,17 @@ public class ManualImageRecategorization extends BaseAnnotation {
 
     private String type;
 
+
     @Builder
-    public ManualImageRecategorization(String annotationId, String fileId,
-                                       String user, AnnotationStatus status,
-                                       OffsetDateTime requestDate, OffsetDateTime processedDate,
-                                       OffsetDateTime softDeletedTime, String type) {
+    public ManualImageRecategorization(String annotationId,
+                                       String fileId,
+                                       String user,
+                                       AnnotationStatus status,
+                                       OffsetDateTime requestDate,
+                                       OffsetDateTime processedDate,
+                                       OffsetDateTime softDeletedTime,
+                                       String type) {
+
         super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
         this.type = type;
     }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualLegalBasisChange.java

@@ -1,13 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped;
 
+import java.time.OffsetDateTime;
+
 import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+
 import lombok.Builder;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 
-import java.time.OffsetDateTime;
-
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
@@ -17,15 +18,23 @@ public class ManualLegalBasisChange extends BaseAnnotation {
     private String value;
     private String legalBasis;
 
+
     @Builder
-    public ManualLegalBasisChange(String annotationId, String fileId,
-                                  String user, AnnotationStatus status,
-                                  OffsetDateTime requestDate, OffsetDateTime processedDate,
-                                  OffsetDateTime softDeletedTime, String legalBasis,
-                                  String section, String value) {
+    public ManualLegalBasisChange(String annotationId,
+                                  String fileId,
+                                  String user,
+                                  AnnotationStatus status,
+                                  OffsetDateTime requestDate,
+                                  OffsetDateTime processedDate,
+                                  OffsetDateTime softDeletedTime,
+                                  String legalBasis,
+                                  String section,
+                                  String value) {
+
         super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
         this.legalBasis = legalBasis;
         this.section = section;
         this.value = value;
     }
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualRedactionEntry.java

@@ -1,16 +1,17 @@
 package com.iqser.red.service.persistence.service.v1.api.model.annotations.entitymapped;
 
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
-import lombok.Builder;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.AnnotationStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.annotations.Rectangle;
+
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
 @Data
 @NoArgsConstructor
 @EqualsAndHashCode(callSuper = true)
@@ -29,16 +30,28 @@ public class ManualRedactionEntry extends BaseAnnotation {
     private String textAfter;
     private String sourceId;
 
+
     @Builder
-    public ManualRedactionEntry(String annotationId, String fileId,
-                                String user, AnnotationStatus status,
-                                OffsetDateTime requestDate, OffsetDateTime processedDate,
-                                OffsetDateTime softDeletedTime, String value,
-                                String textBefore, String textAfter,
-                                boolean rectangle, boolean addToDictionary,
-                                boolean addToDossierDictionary, String legalBasis,
-                                String section, String reason, String type,
-                                List<Rectangle> positions, String sourceId) {
+    public ManualRedactionEntry(String annotationId,
+                                String fileId,
+                                String user,
+                                AnnotationStatus status,
+                                OffsetDateTime requestDate,
+                                OffsetDateTime processedDate,
+                                OffsetDateTime softDeletedTime,
+                                String value,
+                                String textBefore,
+                                String textAfter,
+                                boolean rectangle,
+                                boolean addToDictionary,
+                                boolean addToDossierDictionary,
+                                String legalBasis,
+                                String section,
+                                String reason,
+                                String type,
+                                List<Rectangle> positions,
+                                String sourceId) {
+
         super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
         this.textBefore = textBefore;
         this.textAfter = textAfter;

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/annotations/entitymapped/ManualResizeRedaction.java

@@ -23,17 +23,25 @@ public class ManualResizeRedaction extends BaseAnnotation {
     private String textAfter;
     private Boolean updateDictionary;
 
+
     @Builder
-    public ManualResizeRedaction(String annotationId, String fileId,
-                                 String user, AnnotationStatus status,
-                                 OffsetDateTime requestDate, OffsetDateTime processedDate,
-                                 OffsetDateTime softDeletedTime, String value,
-                                 String textBefore, String textAfter,
+    public ManualResizeRedaction(String annotationId,
+                                 String fileId,
+                                 String user,
+                                 AnnotationStatus status,
+                                 OffsetDateTime requestDate,
+                                 OffsetDateTime processedDate,
+                                 OffsetDateTime softDeletedTime,
+                                 String value,
+                                 String textBefore,
+                                 String textAfter,
                                  List<Rectangle> positions) {
+
         super(annotationId, fileId, user, status, requestDate, processedDate, softDeletedTime);
         this.textBefore = textBefore;
         this.textAfter = textAfter;
         this.value = value;
         this.positions = positions != null ? positions : new ArrayList<>();
     }
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AddNotificationRequest.java

@@ -1,13 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.audit;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @Data
 @Builder
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AuditModel.java

@@ -1,14 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.audit;
 
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.OffsetDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
 @Data
 @Builder
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AuditRequest.java

@@ -1,13 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.audit;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.HashMap;
-import java.util.Map;
-
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
@@ -23,5 +23,4 @@ public class AuditRequest {
     @Builder.Default
     private Map<String, Object> details = new HashMap<>();
 
-
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/audit/AuditSearchRequest.java

@@ -1,12 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.model.audit;
 
+import java.time.OffsetDateTime;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.OffsetDateTime;
-
 @Data
 @Builder
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/common/JSONPrimitive.java

@@ -11,7 +11,9 @@ public class JSONPrimitive<T> {
 
     private final T value;
 
+
     public static <T> JSONPrimitive<T> of(T value) {
+
         return new JSONPrimitive<>(value);
     }
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/common/Page.java

@@ -1,13 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.common;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @AllArgsConstructor
 @NoArgsConstructor
 @Data
@@ -19,4 +19,5 @@ public class Page<T> {
     private long totalHits;
     private int page;
     private int pageSize;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/CreateOrUpdateDossierTemplateRequest.java

@@ -1,14 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.time.OffsetDateTime;
 import java.util.HashSet;
 import java.util.Set;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DossierAttributeConfig.java

@@ -1,12 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierAttributeType;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-
 @Data
 @Builder
 @NoArgsConstructor
@@ -20,5 +20,4 @@ public class DossierAttributeConfig {
     private DossierAttributeType type = DossierAttributeType.TEXT;
     private String dossierTemplateId;
 
-
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DossierTemplate.java

@@ -1,15 +1,15 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.time.OffsetDateTime;
 import java.util.HashSet;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @Builder
@@ -30,4 +30,5 @@ public class DossierTemplate {
     private boolean deleted;
     private Set<DownloadFileType> downloadFileTypes = new HashSet<>();
     private DossierTemplateStatus dossierTemplateStatus;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DossierTemplateDictionaryStats.java

@@ -1,14 +1,15 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionarySummary;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Data
 @Builder
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DossierTemplateStats.java

@@ -1,15 +1,16 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.ProcessingStatus;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Data
 @Builder
 @NoArgsConstructor
@@ -63,4 +64,5 @@ public class DossierTemplateStats {
         private int count;
 
     }
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DossierTemplateStatus.java

@@ -1,5 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
 public enum DossierTemplateStatus {
-    INCOMPLETE, INACTIVE, ACTIVE
+    INCOMPLETE,
+    INACTIVE,
+    ACTIVE
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/DownloadFileType.java

@@ -1,5 +1,10 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
 public enum DownloadFileType {
-    ORIGINAL, PREVIEW, REDACTED, ANNOTATED, FLATTEN, DELTA_PREVIEW
+    ORIGINAL,
+    PREVIEW,
+    REDACTED,
+    ANNOTATED,
+    FLATTEN,
+    DELTA_PREVIEW
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/FileAttributesGeneralConfiguration.java

@@ -15,5 +15,4 @@ public class FileAttributesGeneralConfiguration {
     private String filenameMappingColumnHeaderName;
     private String delimiter;
 
-
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ImportCsvResponse.java

@@ -1,13 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.HashSet;
-import java.util.Set;
-
 @Data
 @Builder
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ReportTemplate.java

@@ -1,12 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
+import java.time.OffsetDateTime;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.OffsetDateTime;
-
 @Data
 @Builder
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ReportTemplateDownload.java

@@ -12,4 +12,5 @@ import lombok.NoArgsConstructor;
 public class ReportTemplateDownload {
 
     private byte[] file;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ReportTemplateUpdateRequest.java

@@ -1,16 +1,22 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
-import lombok.*;
-
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
 
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class ReportTemplateUpdateRequest {
+
     @NonNull
     private String fileName;
 
     private boolean multiFileReport;
     private boolean activeByDefault;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/ReportTemplateUploadRequest.java

@@ -1,6 +1,11 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate;
 
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
 
 @Data
 @Builder
@@ -17,4 +22,5 @@ public class ReportTemplateUploadRequest {
 
     private boolean multiFileReport;
     private boolean activeByDefault;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/DigitalSignatureType.java

@@ -1,5 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
 
 public enum DigitalSignatureType {
-    CERTIFICATE, KMS, HSM;
+    CERTIFICATE,
+    KMS,
+    HSM;
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/DigitalSignatureUpdateModel.java

@@ -1,6 +1,10 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
 
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @NoArgsConstructor(access = AccessLevel.PRIVATE)

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/configuration/WatermarkOrientation.java

@@ -1,5 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration;
 
 public enum WatermarkOrientation {
-    VERTICAL, HORIZONTAL, DIAGONAL
+    VERTICAL,
+    HORIZONTAL,
+    DIAGONAL
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/CreateOrUpdateDossierRequest.java

@@ -1,17 +1,18 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 @Data
 @NoArgsConstructor
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/CreateOrUpdateDossierStatusRequest.java

@@ -22,4 +22,5 @@ public class CreateOrUpdateDossierStatusRequest {
     private int rank;
 
     private String dossierTemplateId;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DeletedDossier.java

@@ -1,10 +1,10 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
 
+import java.time.OffsetDateTime;
+
 import lombok.Builder;
 import lombok.Data;
 
-import java.time.OffsetDateTime;
-
 @Data
 @Builder
 public class DeletedDossier {

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/Dossier.java

@@ -1,16 +1,17 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.time.OffsetDateTime;
 import java.util.HashSet;
 import java.util.Set;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 @Data
 @Builder
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierAttribute.java

@@ -5,7 +5,6 @@ import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-
 @Data
 @AllArgsConstructor
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierAttributeType.java

@@ -1,5 +1,8 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
 
 public enum DossierAttributeType {
-    TEXT, NUMBER, DATE, IMAGE
+    TEXT,
+    NUMBER,
+    DATE,
+    IMAGE
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierChange.java

@@ -1,10 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
 
-import lombok.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
 
 @Data
 @Builder
-@EqualsAndHashCode(of="dossierId")
+@EqualsAndHashCode(of = "dossierId")
 @NoArgsConstructor
 @AllArgsConstructor
 public class DossierChange {
@@ -12,4 +16,5 @@ public class DossierChange {
     private String dossierId;
     private boolean dossierChanges;
     private boolean fileChanges;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierStats.java

@@ -1,17 +1,22 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.ProcessingStatus;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
-import lombok.*;
-
 import java.time.OffsetDateTime;
 import java.util.Map;
 
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.ProcessingStatus;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
 @Data
 @Builder
 @NoArgsConstructor
 @AllArgsConstructor
-@EqualsAndHashCode(of ={ "dossierId"})
+@EqualsAndHashCode(of = {"dossierId"})
 public class DossierStats {
 
     private String dossierId;
@@ -28,4 +33,5 @@ public class DossierStats {
     private Map<WorkflowStatus, Integer> fileCountPerWorkflowStatus;
     private OffsetDateTime lastFileUpdateDate;
     private OffsetDateTime fileManipulationDate;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/DossierVisibility.java

@@ -2,5 +2,6 @@ package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.d
 
 public enum DossierVisibility {
 
-    PRIVATE, PUBLIC;
+    PRIVATE,
+    PUBLIC;
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/AddFileRequest.java

@@ -1,6 +1,11 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
 
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
 
 @Data
 @Builder

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileAttributeConfig.java

@@ -22,5 +22,4 @@ public class FileAttributeConfig {
     private FileAttributeType type = FileAttributeType.TEXT;
     private String dossierTemplateId;
 
-
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileAttributeType.java

@@ -1,5 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
 
 public enum FileAttributeType {
-    TEXT, NUMBER, DATE
+    TEXT,
+    NUMBER,
+    DATE
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/FileModel.java

@@ -71,11 +71,16 @@ public class FileModel {
     private OffsetDateTime fileManipulationDate;
     private boolean hasHighlights;
 
-    public boolean isAnalysisRequired(){
+
+    public boolean isAnalysisRequired() {
+
         return this.fullAnalysisRequired || this.reanalysisRequired;
     }
 
+
     public boolean isSoftOrHardDeleted() {
+
         return deleted != null || hardDeletedTime != null;
     }
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/ProcessingStatus.java

@@ -1,6 +1,24 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
 
 public enum ProcessingStatus {
-    ANALYSE, ERROR, FULLREPROCESS, IMAGE_ANALYZING, INDEXING, NER_ANALYZING, OCR_PROCESSING_QUEUED, OCR_PROCESSING, PROCESSED, PROCESSING, REPROCESS, SURROUNDING_TEXT_PROCESSING, UNPROCESSED, FULL_PROCESSING, PRE_PROCESSING_QUEUED, PRE_PROCESSING, PRE_PROCESSED, FIGURE_DETECTION_ANALYZING, TABLE_PARSING_ANALYZING
+    ANALYSE,
+    ERROR,
+    FULLREPROCESS,
+    IMAGE_ANALYZING,
+    INDEXING,
+    NER_ANALYZING,
+    OCR_PROCESSING_QUEUED,
+    OCR_PROCESSING,
+    PROCESSED,
+    PROCESSING,
+    REPROCESS,
+    SURROUNDING_TEXT_PROCESSING,
+    UNPROCESSED,
+    FULL_PROCESSING,
+    PRE_PROCESSING_QUEUED,
+    PRE_PROCESSING,
+    PRE_PROCESSED,
+    FIGURE_DETECTION_ANALYZING,
+    TABLE_PARSING_ANALYZING
 
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/dossier/file/WorkflowStatus.java

@@ -1,5 +1,8 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file;
 
 public enum WorkflowStatus {
-    NEW, UNDER_REVIEW, UNDER_APPROVAL, APPROVED
+    NEW,
+    UNDER_REVIEW,
+    UNDER_APPROVAL,
+    APPROVED
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/importexport/ExportDownloadRequest.java

@@ -1,12 +1,18 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.importexport;
 
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class ExportDownloadRequest {
+
     private String userId;
     private String dossierTemplateId;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/importexport/ExportFilename.java

@@ -20,11 +20,12 @@ public enum ExportFilename {
     FALSE_POSITIVES("falsePositives"),
     FALSE_RECOMMENDATION("falseRecommendations");
 
-
     @Getter
     private final String filename;
 
+
     ExportFilename(String filename) {
+
         this.filename = filename;
     }
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/importexport/ImportDossierTemplateRequest.java

@@ -1,12 +1,18 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.importexport;
 
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.NonNull;
 
 @Data
 @Builder
 @AllArgsConstructor
 @NoArgsConstructor(access = AccessLevel.PRIVATE)
 public class ImportDossierTemplateRequest {
+
     @NonNull
     private byte[] archive;
 
@@ -15,4 +21,5 @@ public class ImportDossierTemplateRequest {
     private String userId;
 
     private boolean updateExistingDossierTemplate;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/importexport/ImportTemplateResult.java

@@ -1,5 +1,10 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.importexport;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierAttributeConfig;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplate;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.FileAttributesGeneralConfiguration;
@@ -10,16 +15,12 @@ import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.do
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileAttributeConfig;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 @Data
 @Builder
 @NoArgsConstructor
@@ -42,9 +43,9 @@ public class ImportTemplateResult {
     public List<DossierStatusInfo> dossierStatusInfos = new ArrayList<>();
 
     @Builder.Default
-    public List<DossierAttributeConfig>  dossierAttributesConfigs = new ArrayList<>();
+    public List<DossierAttributeConfig> dossierAttributesConfigs = new ArrayList<>();
 
-    public FileAttributesGeneralConfiguration  fileAttributesGeneralConfiguration;
+    public FileAttributesGeneralConfiguration fileAttributesGeneralConfiguration;
 
     @Builder.Default
     public List<FileAttributeConfig> fileAttributesConfigs = new ArrayList<>();
@@ -55,10 +56,10 @@ public class ImportTemplateResult {
     public String ruleSet;
 
     @Builder.Default
-    public List<ReportTemplateUploadRequest>  reportTemplateUploadRequests = new ArrayList<>();
+    public List<ReportTemplateUploadRequest> reportTemplateUploadRequests = new ArrayList<>();
 
     @Builder.Default
-    public List<Type> types= new ArrayList<>();
+    public List<Type> types = new ArrayList<>();
 
     @Builder.Default
     public Map<String, List<String>> entries = new HashMap<>();

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/legalbasis/LegalBasis.java

@@ -15,5 +15,4 @@ public class LegalBasis {
     private String description;
     private String reason;
 
-
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/legalbasis/LegalBasisMapping.java

@@ -1,11 +1,11 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis;
 
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 @Data
 @NoArgsConstructor
 public class LegalBasisMapping {

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/type/DictionaryEntry.java

@@ -1,12 +1,12 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type;
 
+import java.io.Serializable;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.io.Serializable;
-
 @Data
 @Builder
 @NoArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/type/DictionaryEntryType.java

@@ -1,5 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type;
 
 public enum DictionaryEntryType {
-    ENTRY, FALSE_POSITIVE, FALSE_RECOMMENDATION
+    ENTRY,
+    FALSE_POSITIVE,
+    FALSE_RECOMMENDATION
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/type/DictionarySummary.java

@@ -10,8 +10,10 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class DictionarySummary {
+
     private String id; // type id
     private String type; // type
     private String name; // label
     private long entriesCount; // entries size
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/dossiertemplate/type/DictionarySummaryResponse.java

@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 @AllArgsConstructor
 public class DictionarySummaryResponse {
+
     private String dossierTemplateId;
     private String id; // type id
     private String type; // type

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/DownloadRequest.java

@@ -1,10 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.download;
 
-import lombok.*;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 @Data
 @Builder
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/DownloadStatus.java

@@ -1,15 +1,16 @@
 package com.iqser.red.service.persistence.service.v1.api.model.download;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
 import java.time.OffsetDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DownloadFileType;
+
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
 @Data
 @Builder
 @AllArgsConstructor
@@ -28,5 +29,4 @@ public class DownloadStatus {
     private List<String> fileIds = new ArrayList<>();
     private List<DownloadFileType> downloadFileTypes = new ArrayList<>();
 
-
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/DownloadStatusValue.java

@@ -1,5 +1,8 @@
 package com.iqser.red.service.persistence.service.v1.api.model.download;
 
 public enum DownloadStatusValue {
-    QUEUED, GENERATING, READY, FAILED
+    QUEUED,
+    GENERATING,
+    READY,
+    FAILED
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/download/SetDownloadedRequest.java

@@ -1,6 +1,10 @@
 package com.iqser.red.service.persistence.service.v1.api.model.download;
 
-import lombok.*;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
 @Data
 @Builder
@@ -10,4 +14,5 @@ public class SetDownloadedRequest {
 
     private String userId;
     private String storageId;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReport.java

@@ -1,14 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.license;
 
+import java.time.Instant;
+import java.util.ArrayList;
+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.Instant;
-import java.util.ArrayList;
-import java.util.List;
-
 @Data
 @Builder
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/LicenseReportRequest.java

@@ -1,13 +1,17 @@
 package com.iqser.red.service.persistence.service.v1.api.model.license;
 
-import lombok.*;
-
 import java.time.Instant;
 import java.time.Year;
 import java.time.ZoneOffset;
 import java.util.ArrayList;
 import java.util.List;
 
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
 @Data
 @Builder
 @AllArgsConstructor
@@ -27,11 +31,7 @@ public class LicenseReportRequest {
     public Instant getStartDate() {
 
         if (startDate == null) {
-            startDate = Year.of(getEndDate().atOffset(ZoneOffset.UTC).getYear())
-                    .atMonth(1)
-                    .atDay(1)
-                    .atStartOfDay()
-                    .toInstant(ZoneOffset.UTC);
+            startDate = Year.of(getEndDate().atOffset(ZoneOffset.UTC).getYear()).atMonth(1).atDay(1).atStartOfDay().toInstant(ZoneOffset.UTC);
         }
         return startDate;
     }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/license/ReportData.java

@@ -1,14 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.license;
 
+import java.time.Instant;
+
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.Instant;
-
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.WorkflowStatus;
-
 @Data
 @Builder
 @AllArgsConstructor

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/EmailNotificationType.java

@@ -1,5 +1,7 @@
 package com.iqser.red.service.persistence.service.v1.api.model.notification;
 
 public enum EmailNotificationType {
-    DAILY, DAILY_SUMMARY, WEEKLY_SUMMARY
+    DAILY,
+    DAILY_SUMMARY,
+    WEEKLY_SUMMARY
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/Notification.java

@@ -1,14 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.model.notification;
 
+import java.time.OffsetDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.time.OffsetDateTime;
-import java.util.HashMap;
-import java.util.Map;
-
 @Data
 @Builder
 @AllArgsConstructor
@@ -25,4 +25,5 @@ public class Notification {
     private OffsetDateTime softDeleted;
     private String notificationDetails;
     private Map<String, Object> target = new HashMap<>();
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/NotificationPreferences.java

@@ -1,13 +1,13 @@
 package com.iqser.red.service.persistence.service.v1.api.model.notification;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
-import java.util.ArrayList;
-import java.util.List;
-
 @Data
 @Builder
 @NoArgsConstructor
@@ -21,4 +21,5 @@ public class NotificationPreferences {
     private List<String> emailNotifications = new ArrayList<>();
     @Builder.Default
     private List<String> inAppNotifications = new ArrayList<>();
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/notification/NotificationType.java

@@ -2,10 +2,18 @@ package com.iqser.red.service.persistence.service.v1.api.model.notification;
 
 public enum NotificationType {
 
-    ASSIGN_REVIEWER, ASSIGN_APPROVER, UNASSIGNED_FROM_FILE,
-    DOCUMENT_APPROVED, DOSSIER_OWNER_SET, DOSSIER_OWNER_REMOVED,
-    USER_BECOMES_DOSSIER_MEMBER, USER_REMOVED_AS_DOSSIER_MEMBER,
-    USER_PROMOTED_TO_APPROVER, USER_DEGRADED_TO_REVIEWER,
-    DOSSIER_OWNER_DELETED, DOWNLOAD_READY, DOSSIER_DELETED
+    ASSIGN_REVIEWER,
+    ASSIGN_APPROVER,
+    UNASSIGNED_FROM_FILE,
+    DOCUMENT_APPROVED,
+    DOSSIER_OWNER_SET,
+    DOSSIER_OWNER_REMOVED,
+    USER_BECOMES_DOSSIER_MEMBER,
+    USER_REMOVED_AS_DOSSIER_MEMBER,
+    USER_PROMOTED_TO_APPROVER,
+    USER_DEGRADED_TO_REVIEWER,
+    DOSSIER_OWNER_DELETED,
+    DOWNLOAD_READY,
+    DOSSIER_DELETED
 
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/redactionlog/FilteredRedactionLogRequest.java

@@ -18,4 +18,5 @@ public class FilteredRedactionLogRequest {
     private boolean withManualRedactions;
     private boolean includeFalsePositives;
     private OffsetDateTime specifiedDate;
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ApplicationConfigurationResource.java

@@ -1,6 +1,5 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.ApplicationConfig;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -8,16 +7,21 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseStatus;
 
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.ApplicationConfig;
+
 @ResponseStatus(value = HttpStatus.OK)
 public interface ApplicationConfigurationResource {
 
     String APPLICATION_CONFIG_PATH = "/app-config";
 
+
     @ResponseStatus(value = HttpStatus.CREATED)
-    @PostMapping(value = APPLICATION_CONFIG_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces =  MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = APPLICATION_CONFIG_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     ApplicationConfig createOrUpdateAppConfig(@RequestBody ApplicationConfig appConfig);
 
+
     @ResponseStatus(value = HttpStatus.OK)
     @GetMapping(value = APPLICATION_CONFIG_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
     ApplicationConfig getCurrentApplicationConfig();
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/AuditResource.java

@@ -1,20 +1,26 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import java.util.List;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
 import com.iqser.red.service.persistence.service.v1.api.model.audit.AuditModel;
 import com.iqser.red.service.persistence.service.v1.api.model.audit.AuditRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.audit.AuditSearchRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.audit.CategoryModel;
 import com.iqser.red.service.persistence.service.v1.api.model.common.Page;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 public interface AuditResource {
 
     String PATH = "/audit";
 
+
     /**
      * @param auditRequest - details to audit
      * @throws org.springframework.web.server.ResponseStatusException - 404 - Not Found in case the object doesn't exist
@@ -24,11 +30,13 @@ public interface AuditResource {
     @PostMapping(value = PATH, consumes = MediaType.APPLICATION_JSON_VALUE)
     void audit(@RequestBody AuditRequest auditRequest);
 
+
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @PostMapping(value = PATH + "/search", produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     Page<AuditModel> search(@RequestBody AuditSearchRequest auditSearchRequest);
 
+
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @GetMapping(value = PATH + "/categories", produces = MediaType.APPLICATION_JSON_VALUE)

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DictionaryResource.java

@@ -1,14 +1,22 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import java.util.List;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.configuration.Colors;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntry;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.DictionaryEntryType;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.type.Type;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 @ResponseStatus(value = HttpStatus.OK)
 public interface DictionaryResource {
@@ -52,8 +60,7 @@ public interface DictionaryResource {
 
     @ResponseStatus(HttpStatus.NO_CONTENT)
     @PostMapping(value = TYPE_PATH + TYPE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateTypeValue(@PathVariable(TYPE_PARAMETER_NAME) String typeId,
-                         @RequestBody Type typeValue);
+    void updateTypeValue(@PathVariable(TYPE_PARAMETER_NAME) String typeId, @RequestBody Type typeValue);
 
 
     @ResponseStatus(HttpStatus.CREATED)
@@ -70,13 +77,16 @@ public interface DictionaryResource {
     List<Type> getAllTypesForDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId,
                                              @RequestParam(value = INCLUDE_DELETED_PARAMETER_NAME, required = false, defaultValue = "false") boolean includeDeleted);
 
+
     @GetMapping(value = TYPE_PATH + DOSSIER_PATH + DOSSIER_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     List<Type> getAllTypesForDossier(@PathVariable(DOSSIER_ID_PARAMETER_NAME) String dossierId,
                                      @RequestParam(value = INCLUDE_DELETED_PARAMETER_NAME, required = false, defaultValue = "false") boolean includeDeleted);
 
+
     @GetMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     Type getDictionaryForType(@PathVariable(TYPE_PARAMETER_NAME) String typeId, @RequestParam(value = FROM_VERSION_PARAM, required = false) Long fromVersion);
 
+
     @GetMapping(value = DICTIONARY_PATH + TYPE_PATH_VARIABLE + ENTRIES_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
     List<DictionaryEntry> getEntriesForType(@PathVariable(TYPE_PARAMETER_NAME) String typeId,
                                             @RequestParam(value = FROM_VERSION_PARAM, required = false) Long fromVersion,
@@ -86,6 +96,7 @@ public interface DictionaryResource {
     @GetMapping(value = VERSION_PATH + DOSSIER_TEMPLATE_PATH_VARIABLE)
     long getVersion(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId);
 
+
     @GetMapping(value = VERSION_PATH + DOSSIER_PATH + DOSSIER_ID_PATH_VARIABLE)
     long getVersionForDossier(@PathVariable(DOSSIER_ID_PARAMETER_NAME) String dossierId);
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierAttributesConfigResource.java

@@ -1,11 +1,19 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierAttributeConfig;
+import java.util.List;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
-import java.util.List;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierAttributeConfig;
 
 public interface DossierAttributesConfigResource {
 
@@ -17,11 +25,12 @@ public interface DossierAttributesConfigResource {
     String DOSSIER_ATTRIBUTE_ID = "dossierAttributeId";
     String DOSSIER_ATTRIBUTE_ID_PATH_VARIABLE = "/{" + DOSSIER_ATTRIBUTE_ID + "}";
 
+
     @ResponseBody
     @ResponseStatus(HttpStatus.OK)
     @PostMapping(value = DOSSIER_ATTRIBUTE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    DossierAttributeConfig addOrUpdateDossierAttribute(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId,
-                                                       @RequestBody DossierAttributeConfig dossierAttributeConfig);
+    DossierAttributeConfig addOrUpdateDossierAttribute(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestBody DossierAttributeConfig dossierAttributeConfig);
+
 
     @ResponseBody
     @ResponseStatus(HttpStatus.OK)

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierAttributesResource.java

@@ -1,11 +1,16 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierAttribute;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
 import java.util.List;
 
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierAttribute;
+
 public interface DossierAttributesResource {
 
     String REST_PATH = "/dossierAttributes";
@@ -22,12 +27,15 @@ public interface DossierAttributesResource {
     @PostMapping(value = REST_PATH + SET_PATH + DOSSIER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     List<DossierAttribute> setDossierAttributes(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @RequestBody List<DossierAttribute> dossierAttributes);
 
+
     @PostMapping(value = REST_PATH + UPDATE_PATH + DOSSIER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     DossierAttribute addOrUpdateDossierAttribute(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @RequestBody DossierAttribute dossierAttribute);
 
+
     @GetMapping(value = REST_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
     List<DossierAttribute> getDossierAttributes(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
 
+
     @DeleteMapping(value = REST_PATH + SET_PATH + DOSSIER_ID_PATH_PARAM + DOSSIER_ATTRIBUTE_ID_PATH_PARAM)
     void deleteDossierAttribute(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(DOSSIER_ATTRIBUTE_ID_PARAM) String dossierAttributeId);
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierResource.java

@@ -45,24 +45,30 @@ public interface DossierResource {
 
     String CHANGES_PATH = "/changes";
 
+
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @PostMapping(value = REST_PATH + CHANGES_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
     Set<DossierChange> changesSince(@RequestBody JSONPrimitive<OffsetDateTime> since);
 
+
     @PostMapping(value = REST_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     Dossier addDossier(@RequestBody CreateOrUpdateDossierRequest dossierRequest);
 
+
     @PostMapping(value = REST_PATH + DOSSIER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     Dossier updateDossier(@RequestBody CreateOrUpdateDossierRequest dossierRequest, @PathVariable(DOSSIER_ID_PARAM) String dossierId);
 
+
     @DeleteMapping(value = REST_PATH + DOSSIER_ID_PATH_PARAM)
     void delete(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
 
+
     @GetMapping(value = REST_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
     List<Dossier> getAllDossiers(@RequestParam(name = INCLUDE_ARCHIVED_PARAM, defaultValue = "false", required = false) boolean includeArchived,
                                  @RequestParam(name = INCLUDE_DELETED_PARAM, defaultValue = "false", required = false) boolean includeDeleted);
 
+
     @GetMapping(value = REST_PATH + DOSSIER_TEMPLATE_PATH + DOSSIER_TEMPLATE_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
     List<Dossier> getAllDossiersForDossierTemplateId(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId,
                                                      @RequestParam(name = INCLUDE_ARCHIVED_PARAM, defaultValue = "false", required = false) boolean includeArchived,
@@ -72,29 +78,37 @@ public interface DossierResource {
     @GetMapping(value = REST_PATH + INFO_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
     DossierInformation getDossierInformation(@RequestBody List<String> filteredDossierIds);
 
+
     @GetMapping(value = REST_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
     Dossier getDossierById(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
                            @RequestParam(name = INCLUDE_ARCHIVED_PARAM, defaultValue = "false", required = false) boolean includeArchived,
                            @RequestParam(name = INCLUDE_DELETED_PARAM, defaultValue = "false", required = false) boolean includeDeleted);
 
+
     @GetMapping(value = ARCHIVE_DOSSIERS_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
     List<Dossier> getArchivedDossiers();
 
+
     @GetMapping(value = ARCHIVE_DOSSIERS_PATH + DOSSIER_TEMPLATE_PATH + DOSSIER_TEMPLATE_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
     List<Dossier> getArchivedDossiersForDossierTemplateId(@PathVariable(DOSSIER_TEMPLATE_ID_PARAM) String dossierTemplateId);
 
+
     @GetMapping(value = DELETED_DOSSIERS_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
     List<Dossier> getSoftDeletedDossiers();
 
+
     @DeleteMapping(value = DELETED_DOSSIERS_PATH + HARD_DELETE_PATH)
     void hardDeleteDossiers(@RequestBody Set<String> dossierIds);
 
+
     @PostMapping(value = DELETED_DOSSIERS_PATH + UNDELETE_PATH)
     void undeleteDossiers(@RequestBody Set<String> dossierIds);
 
+
     @PostMapping(value = ARCHIVE_DOSSIERS_PATH + ARCHIVE_PATH)
     void archiveDossiers(@RequestBody Set<String> dossierIds);
 
+
     @PostMapping(value = ARCHIVE_DOSSIERS_PATH + UNARCHIVE_PATH)
     void unarchiveDossiers(@RequestBody Set<String> dossierIds);
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierStatsResource.java

@@ -18,11 +18,14 @@ public interface DossierStatsResource {
     String DOSSIER_ID_PARAM = "dossierId";
     String DOSSIER_ID_PATH_PARAM = "/{" + DOSSIER_ID_PARAM + "}";
 
+
     @Deprecated
     @GetMapping(value = REST_PATH + DOSSIER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
     DossierStats getDossierStats(@PathVariable(DOSSIER_ID_PARAM) String dossierId);
 
+
     @Deprecated
     @PostMapping(value = REST_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
     List<DossierStats> getDossierStats(@RequestBody Set<String> dossierIds);
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierStatusResource.java

@@ -1,12 +1,20 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import java.util.List;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.CreateOrUpdateDossierStatusRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.DossierStatusInfo;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 public interface DossierStatusResource {
 
@@ -27,6 +35,7 @@ public interface DossierStatusResource {
     @PostMapping(value = DOSSIER_STATUS_PATH, consumes = MediaType.APPLICATION_JSON_VALUE)
     DossierStatusInfo createOrUpdateDossierStatus(@RequestBody CreateOrUpdateDossierStatusRequest dossierStatusRequest);
 
+
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @GetMapping(value = DOSSIER_STATUS_PATH + DOSSIER_TEMPLATE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
@@ -38,11 +47,13 @@ public interface DossierStatusResource {
     @PostMapping(value = DOSSIER_STATUS_PATH + DOSSIER_TEMPLATE_PATH, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     List<DossierStatusInfo> getAllDossierStatuses(@RequestBody List<String> dossierTemplateId);
 
+
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @GetMapping(value = DOSSIER_STATUS_PATH + DOSSIER_STATUS_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     DossierStatusInfo getDossierStatus(@PathVariable(DOSSIER_STATUS_ID) String dossierStatusId);
 
+
     @ResponseBody
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     @DeleteMapping(value = DOSSIER_STATUS_PATH + DOSSIER_STATUS_ID_PATH_VARIABLE)

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierTemplateResource.java

@@ -1,17 +1,24 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import java.util.List;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
 import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.CloneDossierTemplateRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.CreateOrUpdateDossierTemplateRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplate;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.importexport.ExportDownloadRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.importexport.ImportDossierTemplateRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.importexport.ImportTemplateResult;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 public interface DossierTemplateResource {
 
@@ -22,42 +29,49 @@ public interface DossierTemplateResource {
 
     String USER_ID_PARAM = "userId";
 
-    String CLONE_PATH =  "/clone";
-    String EXPORT_PATH =  "/export";
-    String IMPORT_PATH =  "/import";
+    String CLONE_PATH = "/clone";
+    String EXPORT_PATH = "/export";
+    String IMPORT_PATH = "/import";
+
 
     @ResponseBody
     @ResponseStatus(HttpStatus.ACCEPTED)
     @PostMapping(value = DOSSIER_TEMPLATE_PATH, consumes = MediaType.APPLICATION_JSON_VALUE)
     DossierTemplate createOrUpdateDossierTemplate(@RequestBody CreateOrUpdateDossierTemplateRequest dossierTemplate);
 
+
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @GetMapping(value = DOSSIER_TEMPLATE_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
     List<DossierTemplate> getAllDossierTemplates();
 
+
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @GetMapping(value = DOSSIER_TEMPLATE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     DossierTemplate getDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId);
 
+
     @ResponseBody
     @ResponseStatus(value = HttpStatus.NO_CONTENT)
     @DeleteMapping(value = DOSSIER_TEMPLATE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE)
     void deleteDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestParam(USER_ID_PARAM) String deletingUserId);
 
+
     @ResponseBody
     @ResponseStatus(HttpStatus.OK)
-    @PostMapping(value = DOSSIER_TEMPLATE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE+CLONE_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
-    DossierTemplate cloneDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId,
-                                         @RequestBody CloneDossierTemplateRequest cloneDossierTemplateRequest);
+    @PostMapping(value = DOSSIER_TEMPLATE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE + CLONE_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
+    DossierTemplate cloneDossierTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestBody CloneDossierTemplateRequest cloneDossierTemplateRequest);
+
 
     @PostMapping(value = DOSSIER_TEMPLATE_PATH + EXPORT_PATH + "/prepare", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     JSONPrimitive<String> prepareExportDownload(@RequestBody ExportDownloadRequest request);
 
+
     @PostMapping(value = DOSSIER_TEMPLATE_PATH + EXPORT_PATH + "/create", consumes = MediaType.APPLICATION_JSON_VALUE)
     void createExportDownload(@RequestParam String userId, @RequestParam String storageId);
 
+
     @ResponseBody
     @PostMapping(value = DOSSIER_TEMPLATE_PATH + IMPORT_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     DossierTemplate importDossierTemplate(@RequestBody ImportDossierTemplateRequest request);

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DossierTemplateStatsResource.java

@@ -1,14 +1,15 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplateDictionaryStats;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplateStats;
+import java.util.List;
+import java.util.Set;
+
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.List;
-import java.util.Set;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplateDictionaryStats;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.DossierTemplateStats;
 
 public interface DossierTemplateStatsResource {
 
@@ -19,12 +20,15 @@ public interface DossierTemplateStatsResource {
     String DOSSIER_TEMPLATE_ID = "dossierTemplateId";
     String DOSSIER_TEMPLATE_ID_PATH_VARIABLE = "/{" + DOSSIER_TEMPLATE_ID + "}";
 
+
     @PostMapping(value = REST_PATH + DICTIONARY_PATH, produces = MediaType.APPLICATION_JSON_VALUE, consumes = MediaType.APPLICATION_JSON_VALUE)
     List<DossierTemplateDictionaryStats> getDossierTemplateDictionaryStats(@RequestBody Set<String> dossierTemplateIds);
 
+
     @PostMapping(value = REST_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     DossierTemplateStats getDossierTemplateStats(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId);
 
+
     @PostMapping(value = REST_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
     List<DossierTemplateStats> getDossierTemplateStats();
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/DownloadResource.java

@@ -24,12 +24,16 @@ public interface DownloadResource {
     @PostMapping(value = REST_PATH + "/prepare", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     JSONPrimitive<String> prepareDownload(@RequestBody DownloadRequest request);
 
+
     @GetMapping(value = REST_PATH + "/status/{" + USER_ID + "}", consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     List<DownloadStatus> getDownloadStatus(@PathVariable(USER_ID) String userId);
 
+
     @PostMapping(value = REST_PATH + "/setDownloaded", consumes = MediaType.APPLICATION_JSON_VALUE)
     void setDownloaded(@RequestBody JSONPrimitive<String> setDownloadedRequest);
 
+
     @PostMapping(value = REST_PATH + "/delete", consumes = MediaType.APPLICATION_JSON_VALUE)
     void deleteDownloadStatus(@RequestBody JSONPrimitive<String> setDownloadedRequest);
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileAttributesConfigResource.java

@@ -1,12 +1,20 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import java.util.List;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.FileAttributesGeneralConfiguration;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.dossier.file.FileAttributeConfig;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 public interface FileAttributesConfigResource {
 
@@ -22,28 +30,30 @@ public interface FileAttributesConfigResource {
     String FILE_ATTRIBUTE_ID = "fileAttributeId";
     String FILE_ATTRIBUTE_ID_PATH_VARIABLE = "/{" + FILE_ATTRIBUTE_ID + "}";
 
+
     @ResponseBody
     @ResponseStatus(HttpStatus.OK)
     @PutMapping(value = FILE_ATTRIBUTES_PATH + BASE_CONFIG_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     FileAttributesGeneralConfiguration setFileAttributesGeneralConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId,
                                                                       @RequestBody FileAttributesGeneralConfiguration fileAttributesConfig);
 
+
     @ResponseBody
     @ResponseStatus(HttpStatus.OK)
     @GetMapping(value = FILE_ATTRIBUTES_PATH + BASE_CONFIG_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     FileAttributesGeneralConfiguration getFileAttributesGeneralConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId);
 
+
     @ResponseBody
     @ResponseStatus(HttpStatus.OK)
     @PostMapping(value = FILE_ATTRIBUTES_PATH + FILE_ATTRIBUTE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    FileAttributeConfig addOrUpdateFileAttributeConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId,
-                                                       @RequestBody FileAttributeConfig fileAttributeConfig);
+    FileAttributeConfig addOrUpdateFileAttributeConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestBody FileAttributeConfig fileAttributeConfig);
+
 
     @ResponseBody
     @ResponseStatus(HttpStatus.OK)
     @PutMapping(value = FILE_ATTRIBUTES_PATH + FILE_ATTRIBUTE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<FileAttributeConfig> setFileAttributesConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId,
-                                                      @RequestBody List<FileAttributeConfig> fileAttributesConfig);
+    List<FileAttributeConfig> setFileAttributesConfig(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @RequestBody List<FileAttributeConfig> fileAttributesConfig);
 
 
     @ResponseStatus(HttpStatus.NO_CONTENT)
@@ -61,5 +71,4 @@ public interface FileAttributesConfigResource {
     @GetMapping(value = FILE_ATTRIBUTES_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     List<FileAttributeConfig> getFileAttributeConfigs(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId);
 
-
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileAttributesResource.java

@@ -1,13 +1,14 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ImportCsvRequest;
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ImportCsvResponse;
+import java.util.Map;
+
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
-import java.util.Map;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ImportCsvRequest;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ImportCsvResponse;
 
 public interface FileAttributesResource {
 
@@ -23,12 +24,10 @@ public interface FileAttributesResource {
 
 
     @PostMapping(value = REST_PATH + CSV_IMPORT_PATH + DOSSIER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    ImportCsvResponse importCsv(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
-                                @RequestBody ImportCsvRequest importCsvRequest);
+    ImportCsvResponse importCsv(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @RequestBody ImportCsvRequest importCsvRequest);
 
 
     @PostMapping(value = REST_PATH + SET_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void setFileAttributes(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId,
-                           @RequestBody Map<String, String> fileAttributes);
+    void setFileAttributes(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody Map<String, String> fileAttributes);
 
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/FileStatusProcessingUpdateResource.java

@@ -22,7 +22,8 @@ public interface FileStatusProcessingUpdateResource {
 
     @ResponseStatus(value = HttpStatus.OK)
     @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/preprocessing-successful", consumes = MediaType.APPLICATION_JSON_VALUE)
-    void preprocessingSuccessful(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId,
+    void preprocessingSuccessful(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
+                                 @PathVariable(FILE_ID) String fileId,
                                  @RequestBody UntouchedDocumentResponse untouchedDocumentResponse);
 
 
@@ -45,14 +46,17 @@ public interface FileStatusProcessingUpdateResource {
     @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/analysis-failed")
     void analysisFailed(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
 
+
     @ResponseStatus(value = HttpStatus.OK)
     @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/pre-processing")
     void preProcessing(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
 
+
     @ResponseStatus(value = HttpStatus.OK)
     @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/ocr-processing")
     void ocrProcessing(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
 
+
     @ResponseStatus(value = HttpStatus.OK)
     @PostMapping(value = STATUS_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/ocr-failed")
     void ocrFailed(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/LegalBasisMappingResource.java

@@ -1,11 +1,18 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
+import java.util.List;
+
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
 
-import java.util.List;
+import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.legalbasis.LegalBasis;
 
 public interface LegalBasisMappingResource {
 
@@ -19,21 +26,24 @@ public interface LegalBasisMappingResource {
     @PostMapping(value = LEGAL_BASIS_PATH + DOSSIER_TEMPLATE_PATH_VARIABLE + DELETE_PATH, consumes = MediaType.APPLICATION_JSON_VALUE)
     void deleteLegalBasis(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, @RequestBody List<String> legalBasisNames);
 
+
     @PutMapping(value = LEGAL_BASIS_PATH + DOSSIER_TEMPLATE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     void addOrUpdateLegalBasis(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, @RequestBody LegalBasis legalBasis);
 
+
     @ResponseStatus(HttpStatus.NO_CONTENT)
     @PostMapping(value = LEGAL_BASIS_PATH + DOSSIER_TEMPLATE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     void setLegalBasisMapping(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, @RequestBody List<LegalBasis> legalBasisMapping);
 
+
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @GetMapping(value = LEGAL_BASIS_PATH + DOSSIER_TEMPLATE_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     List<LegalBasis> getLegalBasisMapping(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId);
 
+
     @ResponseStatus(HttpStatus.OK)
     @GetMapping(value = LEGAL_BASIS_PATH + DOSSIER_TEMPLATE_PATH_VARIABLE + VERSION_PATH)
     long getVersion(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId);
 
-
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/LicenseReportResource.java

@@ -1,10 +1,15 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
 import com.iqser.red.service.persistence.service.v1.api.model.license.LicenseReport;
 import com.iqser.red.service.persistence.service.v1.api.model.license.LicenseReportRequest;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
 
 public interface LicenseReportResource {
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ManualRedactionResource.java

@@ -49,37 +49,45 @@ public interface ManualRedactionResource {
 
 
     @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/add" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ManualAddResponse> addAddRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
+    List<ManualAddResponse> addAddRedaction(@PathVariable(DOSSIER_ID) String dossierId,
+                                            @PathVariable(FILE_ID) String fileId,
                                             @RequestBody List<AddRedactionRequest> addRedactionRequests);
 
 
     @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/remove" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ManualAddResponse> addRemoveRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
+    List<ManualAddResponse> addRemoveRedaction(@PathVariable(DOSSIER_ID) String dossierId,
+                                               @PathVariable(FILE_ID) String fileId,
                                                @RequestBody List<RemoveRedactionRequest> removeRedactionRequest);
 
 
     @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/force" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ManualAddResponse> addForceRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
+    List<ManualAddResponse> addForceRedaction(@PathVariable(DOSSIER_ID) String dossierId,
+                                              @PathVariable(FILE_ID) String fileId,
                                               @RequestBody List<ForceRedactionRequest> forceRedactionRequests);
 
 
     @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/legalBasis" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ManualAddResponse> addLegalBasisChange(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
+    List<ManualAddResponse> addLegalBasisChange(@PathVariable(DOSSIER_ID) String dossierId,
+                                                @PathVariable(FILE_ID) String fileId,
                                                 @RequestBody List<LegalBasisChangeRequest> legalBasisChangeRequests);
 
 
     @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/recategorize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ManualAddResponse> addImageRecategorization(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
+    List<ManualAddResponse> addImageRecategorization(@PathVariable(DOSSIER_ID) String dossierId,
+                                                     @PathVariable(FILE_ID) String fileId,
                                                      @RequestBody List<ImageRecategorizationRequest> imageRecategorizationRequests);
 
 
     @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/comment" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + ANNOTATION_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    Comment addComment(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @PathVariable(ANNOTATION_ID) String annotationId,
+    Comment addComment(@PathVariable(DOSSIER_ID) String dossierId,
+                       @PathVariable(FILE_ID) String fileId,
+                       @PathVariable(ANNOTATION_ID) String annotationId,
                        @RequestBody CommentRequest comment);
 
 
     @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/resize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<ManualAddResponse> addResizeRedaction(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
+    List<ManualAddResponse> addResizeRedaction(@PathVariable(DOSSIER_ID) String dossierId,
+                                               @PathVariable(FILE_ID) String fileId,
                                                @RequestBody List<ResizeRedactionRequest> resizeRedactionRequests);
 
 
@@ -156,7 +164,8 @@ public interface ManualRedactionResource {
 
 
     @PostMapping(value = MANUAL_REDACTION_REST_PATH + "/status/recategorize" + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateImageRecategorizationStatus(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId,
+    void updateImageRecategorizationStatus(@PathVariable(DOSSIER_ID) String dossierId,
+                                           @PathVariable(FILE_ID) String fileId,
                                            @RequestBody UpdateRedactionRequest updateStatusRequest);
 
 

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/NotificationPreferencesResource.java

@@ -1,9 +1,15 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.notification.NotificationPreferences;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import com.iqser.red.service.persistence.service.v1.api.model.notification.NotificationPreferences;
 
 public interface NotificationPreferencesResource {
 
@@ -16,10 +22,13 @@ public interface NotificationPreferencesResource {
     @PostMapping(value = REST_PATH + USER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE)
     void setNotificationPreferences(@PathVariable(USER_ID_PARAM) String userId, @RequestBody NotificationPreferences notificationRequest);
 
+
     @ResponseStatus(value = HttpStatus.OK)
     @GetMapping(value = REST_PATH + USER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
     NotificationPreferences getNotificationPreferences(@PathVariable(USER_ID_PARAM) String userId);
 
+
     @DeleteMapping(value = REST_PATH + USER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE)
     void deleteNotificationPreferences(@PathVariable(USER_ID_PARAM) String userId);
+
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/NotificationResource.java

@@ -1,14 +1,22 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import java.time.OffsetDateTime;
+import java.util.List;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
 import com.iqser.red.service.persistence.service.v1.api.model.audit.AddNotificationRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
 import com.iqser.red.service.persistence.service.v1.api.model.notification.Notification;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-import java.time.OffsetDateTime;
-import java.util.List;
 
 @ResponseStatus(value = HttpStatus.OK)
 public interface NotificationResource {
@@ -25,24 +33,23 @@ public interface NotificationResource {
     String SET_SEEN_PARAM = "setSeen";
     String SET_READ_PARAM = "setRead";
 
+
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @PostMapping(value = NOTIFICATION_PATH + CHANGES_PATH + USER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    JSONPrimitive<Boolean> hasNewNotificationsSince(@PathVariable(USER_ID_PARAM) String userId,
-                                                    @RequestBody JSONPrimitive<OffsetDateTime> since);
+    JSONPrimitive<Boolean> hasNewNotificationsSince(@PathVariable(USER_ID_PARAM) String userId, @RequestBody JSONPrimitive<OffsetDateTime> since);
+
 
     @PostMapping(value = NOTIFICATION_PATH, consumes = MediaType.APPLICATION_JSON_VALUE)
     void addNotification(@RequestBody AddNotificationRequest addNotificationRequest);
 
 
     @PostMapping(value = NOTIFICATION_PATH + TOGGLE_SEEN_PATH + USER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void toggleSeen(@PathVariable(USER_ID_PARAM) String userId, @RequestBody List<Long> notificationIds,
-                    @RequestParam(SET_SEEN_PARAM) boolean setSeen);
+    void toggleSeen(@PathVariable(USER_ID_PARAM) String userId, @RequestBody List<Long> notificationIds, @RequestParam(SET_SEEN_PARAM) boolean setSeen);
 
 
     @PostMapping(value = NOTIFICATION_PATH + TOGGLE_READ_PATH + USER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void toggleRead(@PathVariable(USER_ID_PARAM) String userId, @RequestBody List<Long> notificationIds,
-                    @RequestParam(SET_READ_PARAM) boolean setRead);
+    void toggleRead(@PathVariable(USER_ID_PARAM) String userId, @RequestBody List<Long> notificationIds, @RequestParam(SET_READ_PARAM) boolean setRead);
 
 
     @DeleteMapping(value = NOTIFICATION_PATH + USER_ID_PATH_PARAM, consumes = MediaType.APPLICATION_JSON_VALUE)
@@ -52,7 +59,6 @@ public interface NotificationResource {
     @ResponseBody
     @ResponseStatus(value = HttpStatus.OK)
     @GetMapping(value = NOTIFICATION_PATH + USER_ID_PATH_PARAM, produces = MediaType.APPLICATION_JSON_VALUE)
-    List<Notification> getNotifications(@PathVariable(USER_ID_PARAM) String userId,
-                                        @RequestParam(INCLUDE_SEEN_PARAM) boolean includeSeen);
+    List<Notification> getNotifications(@PathVariable(USER_ID_PARAM) String userId, @RequestParam(INCLUDE_SEEN_PARAM) boolean includeSeen);
 
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReanalysisResource.java

@@ -35,7 +35,8 @@ public interface ReanalysisResource {
 
 
     @PostMapping(value = REANALYZE_PATH + DOSSIER_ID_PATH_PARAM + BULK_REST_PATH)
-    void reanalyzeFiles(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @RequestBody Set<String> fileIds,
+    void reanalyzeFiles(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
+                        @RequestBody Set<String> fileIds,
                         @RequestParam(value = "force", required = false, defaultValue = FALSE) boolean force);
 
 
@@ -44,7 +45,8 @@ public interface ReanalysisResource {
 
 
     @PostMapping(value = OCR_REANALYZE_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_PARAM)
-    void ocrFile(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID_PARAM) String fileId,
+    void ocrFile(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
+                 @PathVariable(FILE_ID_PARAM) String fileId,
                  @RequestParam(value = "force", required = false, defaultValue = FALSE) boolean force);
 
 
@@ -54,7 +56,8 @@ public interface ReanalysisResource {
 
     @PostMapping(value = REINDEX_PATH)
     void reindex(@RequestParam(value = DOSSIER_ID_PARAM, required = false) String dossierId,
-                 @RequestParam(value = "dropIndex", required = false, defaultValue = FALSE) boolean dropIndex, @RequestBody Set<String> fileIds);
+                 @RequestParam(value = "dropIndex", required = false, defaultValue = FALSE) boolean dropIndex,
+                 @RequestBody Set<String> fileIds);
 
 
     @PostMapping(value = IMPORT_REDACTIONS_PATH, consumes = MediaType.APPLICATION_JSON_VALUE)

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RedactionLogResource.java

@@ -29,16 +29,20 @@ public interface RedactionLogResource {
 
 
     @GetMapping(value = REDACTION_LOG_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
-    RedactionLog getRedactionLog(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId,
+    RedactionLog getRedactionLog(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
+                                 @PathVariable(FILE_ID) String fileId,
                                  @RequestParam(value = "excludedType", required = false) List<String> excludedTypes,
                                  @RequestParam(value = "withManualRedactions", required = false, defaultValue = "true") boolean withManualRedactions,
                                  @RequestParam(value = "includeFalsePositives", required = false, defaultValue = "false") boolean includeFalsePositives);
 
+
     @GetMapping(value = SECTION_GRID_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     SectionGrid getSectionGrid(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId);
 
+
     @PostMapping(value = REDACTION_LOG_PATH + DOSSIER_ID_PATH_PARAM + FILE_ID_PATH_VARIABLE + "/filtered", produces = MediaType.APPLICATION_JSON_VALUE)
-    RedactionLog getFilteredRedactionLog(@PathVariable(DOSSIER_ID_PARAM) String dossierId, @PathVariable(FILE_ID) String fileId,
+    RedactionLog getFilteredRedactionLog(@PathVariable(DOSSIER_ID_PARAM) String dossierId,
+                                         @PathVariable(FILE_ID) String fileId,
                                          @RequestBody FilteredRedactionLogRequest filteredRedactionLogRequest);
 
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/ReportTemplateResource.java

@@ -1,13 +1,19 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
+import java.util.List;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplate;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplateDownload;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplateUpdateRequest;
 import com.iqser.red.service.persistence.service.v1.api.model.dossiertemplate.ReportTemplateUploadRequest;
-import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 public interface ReportTemplateResource {
 
@@ -23,24 +29,29 @@ public interface ReportTemplateResource {
     String UPDATE_PATH = "update";
 
 
-    @PostMapping(value = REPORT_TEMPLATE_UPLOAD_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces =
-            MediaType.APPLICATION_JSON_VALUE)
+    @PostMapping(value = REPORT_TEMPLATE_UPLOAD_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
     ReportTemplate uploadTemplate(@RequestBody ReportTemplateUploadRequest reportTemplateUploadRequest);
 
+
     @GetMapping(value = REPORT_TEMPLATE_UPLOAD_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     List<ReportTemplate> getAvailableReportTemplates(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId);
 
+
     @GetMapping(value = REPORT_TEMPLATE_UPLOAD_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE + TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     ReportTemplate getReportTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @PathVariable(TEMPLATE_ID) String templateId);
 
+
     @GetMapping(value = REPORT_TEMPLATE_UPLOAD_PATH + DOWNLOAD_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE + TEMPLATE_ID_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     ReportTemplateDownload downloadReportTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @PathVariable(TEMPLATE_ID) String templateId);
 
+
     @DeleteMapping(value = REPORT_TEMPLATE_UPLOAD_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE + TEMPLATE_ID_PATH_VARIABLE)
     void deleteTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @PathVariable(TEMPLATE_ID) String templateId);
 
+
     @PutMapping(value = REPORT_TEMPLATE_UPLOAD_PATH + UPDATE_PATH + DOSSIER_TEMPLATE_ID_PATH_VARIABLE + TEMPLATE_ID_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
-    void updateTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId, @PathVariable(TEMPLATE_ID) String templateId,
+    void updateTemplate(@PathVariable(DOSSIER_TEMPLATE_ID) String dossierTemplateId,
+                        @PathVariable(TEMPLATE_ID) String templateId,
                         @RequestBody ReportTemplateUpdateRequest reportTemplateUpdateRequest);
 
 }

persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/resources/RulesResource.java

@@ -1,9 +1,15 @@
 package com.iqser.red.service.persistence.service.v1.api.resources;
 
-import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.ResponseStatus;
+
+import com.iqser.red.service.persistence.service.v1.api.model.common.JSONPrimitive;
 
 public interface RulesResource {
 
@@ -13,15 +19,18 @@ public interface RulesResource {
     String DOSSIER_TEMPLATE_PATH_VARIABLE = "/{" + DOSSIER_TEMPLATE_PARAMETER_NAME + "}";
     String VERSION_PATH = "/version";
 
+
     @ResponseStatus(HttpStatus.NO_CONTENT)
     @PostMapping(value = PATH + DOSSIER_TEMPLATE_PATH_VARIABLE, consumes = MediaType.APPLICATION_JSON_VALUE)
     void setRules(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId, @RequestBody JSONPrimitive<String> rules);
 
+
     @ResponseBody
     @ResponseStatus(HttpStatus.OK)
     @GetMapping(value = PATH + DOSSIER_TEMPLATE_PATH_VARIABLE, produces = MediaType.APPLICATION_JSON_VALUE)
     JSONPrimitive<String> getRules(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId);
 
+
     @ResponseStatus(HttpStatus.OK)
     @GetMapping(value = PATH + DOSSIER_TEMPLATE_PATH_VARIABLE + VERSION_PATH)
     long getVersion(@PathVariable(DOSSIER_TEMPLATE_PARAMETER_NAME) String dossierTemplateId);