RED-9472: seperation of system rules

fixed failing tests by mocking rulebuilder service

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ApprovalTest.java

@@ -3,7 +3,6 @@ package com.iqser.red.service.peristence.v1.server.integration.tests;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.when;
@@ -11,13 +10,9 @@ import static org.mockito.Mockito.when;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.boot.test.mock.mockito.SpyBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import com.iqser.red.service.peristence.v1.server.integration.client.FileClient;
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider;
@@ -25,7 +20,6 @@ import com.iqser.red.service.peristence.v1.server.integration.service.DossierTes
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.TypeProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.LegalBasisEntity;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.LegalBasisMappingPersistenceService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierTemplateModel;
@@ -36,9 +30,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.Position;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.Dossier;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.warning.ApproveResponse;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.warning.WarningType;
 
@@ -58,23 +49,10 @@ public class ApprovalTest extends AbstractPersistenceServerServiceTest {
 
     @Autowired
     private FileClient fileClient;
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
     @SpyBean
     private LegalBasisMappingPersistenceService legalBasisMappingPersistenceService;
 
 
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
-
     @Test
     public void testApprovalNoWarnings() {
 

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentDefinitionTests.java

@@ -5,30 +5,20 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.util.List;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemplateExternalClient;
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.ComponentDefinitionPersistenceService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierTemplateModel;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.component.ComponentDefinition;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.component.ComponentDefinitionAddRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.component.ComponentDefinitionUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 
 import feign.FeignException;
 
@@ -43,19 +33,6 @@ public class ComponentDefinitionTests extends AbstractPersistenceServerServiceTe
     @Autowired
     private ComponentDefinitionPersistenceService componentDefinitionPersistenceService;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @Test
     public void testCreateComponentDefinition() {

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentLogStorageToMongoDBTest.java

@@ -1,8 +1,6 @@
 package com.iqser.red.service.peristence.v1.server.integration.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -14,21 +12,16 @@ import java.util.Map;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.management.v1.processor.migration.StorageToMongoCopyService;
 import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService;
 import com.iqser.red.service.persistence.management.v1.processor.utils.StorageIdUtils;
@@ -39,9 +32,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.OldComponentLogEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.OldComponentLogEntryValue;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.mongo.document.OldComponentLogEntryDocument;
 import com.iqser.red.service.persistence.service.v1.api.shared.mongo.mapper.ComponentLogDocumentMapper;
 import com.iqser.red.service.persistence.service.v1.api.shared.mongo.repository.OldComponentLogEntryDocumentRepository;
@@ -67,19 +57,6 @@ public class ComponentLogStorageToMongoDBTest extends AbstractPersistenceServerS
 
     private final ComponentLogDocumentMapper mapper = ComponentLogDocumentMapper.INSTANCE;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @Test
     @SneakyThrows

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentLogUpdateTest.java

@@ -1,32 +1,22 @@
 package com.iqser.red.service.peristence.v1.server.integration.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLog;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntry;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLogEntryValue;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.mongo.document.ComponentLogEntryDocument;
 import com.iqser.red.service.persistence.service.v1.api.shared.mongo.mapper.ComponentLogDocumentMapper;
 import com.iqser.red.service.persistence.service.v1.api.shared.mongo.repository.ComponentLogEntryDocumentRepository;
@@ -46,19 +36,6 @@ public class ComponentLogUpdateTest extends AbstractPersistenceServerServiceTest
 
     private final ComponentLogDocumentMapper mapper = ComponentLogDocumentMapper.INSTANCE;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @Test
     @SneakyThrows

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ComponentOverrideTest.java

@@ -4,8 +4,6 @@ import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.io.IOException;
 import java.util.List;
@@ -14,10 +12,7 @@ import java.util.Set;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -27,13 +22,9 @@ import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemp
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.management.v1.processor.service.FileService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.componentlog.ComponentLog;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.component.RevertOverrideRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 import com.iqser.red.service.persistence.service.v2.api.external.model.Component;
 import com.iqser.red.service.persistence.service.v2.api.external.model.ComponentValue;
 import com.iqser.red.service.persistence.service.v2.api.external.model.EntityReference;
@@ -64,17 +55,11 @@ public class ComponentOverrideTest extends AbstractPersistenceServerServiceTest
     @Autowired
     private ComponentControllerV2 componentControllerV2;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
 
     @BeforeEach
     @SneakyThrows
     void setUp() {
 
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
         ReflectionTestUtils.setField(componentControllerV2, "applicationType", "DocuMine");
     }
 

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java

@@ -5,8 +5,6 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.Comparator;
@@ -19,9 +17,6 @@ import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient;
 import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemplateClient;
@@ -29,7 +24,6 @@ import com.iqser.red.service.peristence.v1.server.integration.service.DossierTem
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.TypeProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.management.v1.processor.service.DictionaryManagementService;
 import com.iqser.red.service.persistence.management.v1.processor.service.DictionaryService;
 import com.iqser.red.service.persistence.service.v1.api.external.model.UpdateEntries;
@@ -40,9 +34,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dictionary.
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dictionary.DictionaryDifference;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dictionary.DictionaryDifferencePerType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dictionary.DictionaryDifferenceResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionaryEntryType;
 import com.knecon.fforesight.tenantcommons.TenantContext;
 
@@ -71,16 +62,10 @@ public class DictionaryTest extends AbstractPersistenceServerServiceTest {
     private final List<String> testList1 = List.of("William c. Spare", "Charalampos", "Carina Wilson", "PATRICIA A. SHEEHY", "William C. Spare", "carlsen", "Patricia A. Sheehy");
     private final List<String> testList2 = List.of("William C. Spare", "Charalampos", "Carina Wilson", "Patricia A. Sheehy", "William c. Spare", "carlsen", "PATRICIA A. SHEEHY");
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
 
     @BeforeEach
     public void createDossierRedactionDictionary() {
 
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
         TenantContext.setTenantId("redaction");
     }
 

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierAttributeTest.java

@@ -3,34 +3,24 @@ package com.iqser.red.service.peristence.v1.server.integration.tests;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
 import org.assertj.core.util.Lists;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import com.iqser.red.service.peristence.v1.server.integration.client.DossierAttributeClient;
 import com.iqser.red.service.peristence.v1.server.integration.client.DossierAttributeConfigClient;
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierAttributes;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierAttributesConfig;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierAttributeConfig;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.DossierAttribute;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.DossierAttributeType;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 
 import feign.FeignException;
 import lombok.SneakyThrows;
@@ -46,19 +36,6 @@ public class DossierAttributeTest extends AbstractPersistenceServerServiceTest {
     @Autowired
     private DossierAttributeClient dossierAttributeClient;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @SneakyThrows
     @Test

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateStatsTest.java

@@ -1,8 +1,6 @@
 package com.iqser.red.service.peristence.v1.server.integration.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.time.OffsetDateTime;
 import java.time.temporal.ChronoUnit;
@@ -12,12 +10,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import com.google.common.collect.Sets;
 import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient;
@@ -34,7 +28,6 @@ import com.iqser.red.service.peristence.v1.server.integration.service.DossierTes
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.UserProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.FileStatusPersistenceService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.CreateTypeValue;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierStatusRequest;
@@ -43,9 +36,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.PageExclusi
 import com.iqser.red.service.persistence.service.v1.api.shared.model.PageRange;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierTemplateDictionaryStats;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DownloadFileType;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionaryEntryType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionarySummary;
 import com.knecon.fforesight.tenantcommons.TenantContext;
@@ -97,19 +87,6 @@ public class DossierTemplateStatsTest extends AbstractPersistenceServerServiceTe
     @Autowired
     private UserProvider userProvider;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @Test
     public void testDossierTemplateDictionaryStats() {

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java

@@ -4,22 +4,16 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.time.OffsetDateTime;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.IntStream;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockMultipartFile;
 import org.testcontainers.shaded.org.apache.commons.lang3.StringUtils;
 
@@ -33,7 +27,6 @@ import com.iqser.red.service.peristence.v1.server.integration.service.DossierTem
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.TypeProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.management.v1.processor.service.DossierManagementService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierStatusRequest;
@@ -42,9 +35,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.common.JSON
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.ReportTemplate;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.WatermarkOrientation;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.Dossier;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 
 import feign.FeignException;
 import lombok.extern.slf4j.Slf4j;
@@ -79,19 +69,6 @@ public class DossierTest extends AbstractPersistenceServerServiceTest {
     @Autowired
     private TypeProvider typeProvider;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @Test
     @Disabled // TODO parallel does not work with tenantContext currently
@@ -563,5 +540,4 @@ public class DossierTest extends AbstractPersistenceServerServiceTest {
         assertTrue(result.getMessage().contains("Dossier name can not be longer than 254 characters"));
     }
 
-
 }

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadTest.java

@@ -1,20 +1,14 @@
 package com.iqser.red.service.peristence.v1.server.integration.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.iqser.red.service.pdftron.redaction.v1.api.model.RedactionResultDetail;
@@ -26,7 +20,6 @@ import com.iqser.red.service.peristence.v1.server.integration.service.DossierTes
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.UserProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.management.v1.processor.model.DownloadJob;
 import com.iqser.red.service.persistence.management.v1.processor.service.download.DownloadMessageReceiver;
 import com.iqser.red.service.persistence.management.v1.processor.service.download.DownloadPreparationService;
@@ -35,9 +28,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.PrepareDown
 import com.iqser.red.service.persistence.service.v1.api.shared.model.RemoveDownloadRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DownloadFileType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 import com.iqser.red.service.redaction.report.v1.api.model.ReportResultMessage;
 import com.knecon.fforesight.tenantcommons.EncryptionDecryptionService;
 import com.knecon.fforesight.tenantcommons.TenantContext;
@@ -77,19 +67,6 @@ public class DownloadTest extends AbstractPersistenceServerServiceTest {
     @Autowired
     EncryptionDecryptionService encryptionDecryptionService;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @Test
     @Disabled
@@ -119,10 +96,7 @@ public class DownloadTest extends AbstractPersistenceServerServiceTest {
                                                                .fileIds(List.of(file2.getId()))
                                                                .build());
 
-        downloadMessageReceiver.receive(DownloadJob.builder()
+        downloadMessageReceiver.receive(DownloadJob.builder().userId(userProvider.getUserId()).storageId(downloads.getStorageId()).build());
-                                                .userId(userProvider.getUserId())
-                                                .storageId(downloads.getStorageId())
-                                                .build());
 
         var reportInfoId = downloads.getStorageId().substring(0, downloads.getStorageId().length() - 3) + "/REPORT_INFO.json";
         storageService.storeJSONObject(TenantContext.getTenantId(), reportInfoId, new ArrayList<>());

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileAttributeTest.java

@@ -6,8 +6,6 @@ import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -16,13 +14,9 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.apache.commons.io.IOUtils;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockMultipartFile;
 
 import com.iqser.red.service.peristence.v1.server.integration.client.FileAttributeClient;
@@ -33,16 +27,12 @@ import com.iqser.red.service.peristence.v1.server.integration.client.UploadClien
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.management.v1.processor.service.FileAttributesManagementService;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttributes;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.FileAttributesConfig;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.Dossier;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileAttributeConfig;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileAttributeType;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 
 import feign.FeignException;
 import lombok.SneakyThrows;
@@ -72,19 +62,6 @@ public class FileAttributeTest extends AbstractPersistenceServerServiceTest {
     @Autowired
     private FileAttributesManagementService fileAttribute;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @SneakyThrows
     @Test
@@ -380,18 +357,17 @@ public class FileAttributeTest extends AbstractPersistenceServerServiceTest {
         fileAttributeConfigClient.addOrUpdateFileAttribute(dossier.getDossierTemplateId(), majorVersion);
 
         var missingComma = new MockMultipartFile("file.csv",
-                                               "fileattributes_missing_comma.csv",
+                                                 "fileattributes_missing_comma.csv",
-                                               "application/csv",
+                                                 "application/csv",
-                                               IOUtils.toByteArray(new ClassPathResource("files/csv/fileattributes_missing_comma.csv").getInputStream()));
+                                                 IOUtils.toByteArray(new ClassPathResource("files/csv/fileattributes_missing_comma.csv").getInputStream()));
 
         var result = assertThrows(FeignException.class, () -> uploadClient.upload(missingComma, dossier.getId(), false, false));
         assertTrue(result.getMessage().contains("Invalid CSV file format: Invalid CSV file format at line 2: Expected 5 columns but found 4"));
 
-
         var missingQuotation = new MockMultipartFile("file.csv",
-                                               "fileattributes_missing_quotation_mark.csv",
+                                                     "fileattributes_missing_quotation_mark.csv",
-                                               "application/csv",
+                                                     "application/csv",
-                                               IOUtils.toByteArray(new ClassPathResource("files/csv/fileattributes_missing_quotation_mark.csv").getInputStream()));
+                                                     IOUtils.toByteArray(new ClassPathResource("files/csv/fileattributes_missing_quotation_mark.csv").getInputStream()));
 
         result = assertThrows(FeignException.class, () -> uploadClient.upload(missingQuotation, dossier.getId(), false, false));
         assertTrue(result.getMessage().contains("Invalid CSV file format: Unterminated quoted field at end of CSV line. Beginning of lost text: [4.636.0,4.363.0,4.363.0\\n]"));

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileProcessingTest.java

@@ -1,19 +1,13 @@
 package com.iqser.red.service.peristence.v1.server.integration.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.time.OffsetDateTime;
 import java.time.temporal.ChronoUnit;
 import java.util.List;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import com.iqser.red.service.peristence.v1.server.integration.client.FileClient;
 import com.iqser.red.service.peristence.v1.server.integration.client.FileManagementClient;
@@ -24,16 +18,12 @@ import com.iqser.red.service.peristence.v1.server.integration.service.DossierTes
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.UserProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeResult;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.MessageType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileErrorInfo;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.ProcessingStatus;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 
 public class FileProcessingTest extends AbstractPersistenceServerServiceTest {
 
@@ -61,19 +51,6 @@ public class FileProcessingTest extends AbstractPersistenceServerServiceTest {
     @Autowired
     private UserProvider userProvider;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @Test
     public void testFileProcessing() {

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java

@@ -23,15 +23,11 @@ import java.util.Optional;
 import java.util.Set;
 
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.core.io.ClassPathResource;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 import org.springframework.mock.web.MockMultipartFile;
 
 import com.github.dockerjava.zerodep.shaded.org.apache.commons.codec.binary.Base64;
@@ -53,7 +49,6 @@ import com.iqser.red.service.peristence.v1.server.integration.service.FileTester
 import com.iqser.red.service.peristence.v1.server.integration.service.TypeProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.UserProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.FileAttributesGeneralConfigurationEntity;
 import com.iqser.red.service.persistence.management.v1.processor.service.DossierService;
 import com.iqser.red.service.persistence.management.v1.processor.service.FileDeletionService;
@@ -84,9 +79,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.ProcessingStatus;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.type.DictionaryEntryType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.manual.AddCommentRequestModel;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.manual.AddRedactionRequestModel;
@@ -169,19 +161,6 @@ public class FileTest extends AbstractPersistenceServerServiceTest {
     @Autowired
     private DocumentDataFilesConversionJob documentDataFilesConversionJob;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @Test
     public void testFileSoftDeleteReupload() {
@@ -1100,8 +1079,6 @@ public class FileTest extends AbstractPersistenceServerServiceTest {
         ClassPathResource newDocumentTextDataClassPath = new ClassPathResource("files/newDocumentData/new.DOCUMENT_TEXT.proto");
         storageService.storeObject(TenantContext.getTenantId(), newDocumentTextDataStorageId, newDocumentTextDataClassPath.getInputStream());
 
-
-
         DocumentStructureProto.DocumentStructure documentStructure = storageService.readProtoObject(TenantContext.getTenantId(),
                                                                                                     newDocumentStructureStorageId,
                                                                                                     DocumentStructureProto.DocumentStructure.parser());
@@ -1118,9 +1095,9 @@ public class FileTest extends AbstractPersistenceServerServiceTest {
                                                                                                                    newDocumentPositionDataStorageId,
                                                                                                                    DocumentPositionDataProto.AllDocumentPositionData.parser());
 
-
     }
 
+
     @Test
     @SneakyThrows
     @Disabled
@@ -1194,6 +1171,7 @@ public class FileTest extends AbstractPersistenceServerServiceTest {
     @Test
     @Disabled
     public void testParseProtoFiles() throws Exception {
+
         String tempDir = "/tmp";
 
         Path documentStructurePath = Path.of(tempDir, "new.DOCUMENT_STRUCTURE.proto");
@@ -1206,14 +1184,10 @@ public class FileTest extends AbstractPersistenceServerServiceTest {
         byte[] documentTextBytes = Files.readAllBytes(documentTextPath);
         byte[] documentPositionBytes = Files.readAllBytes(documentPositionPath);
 
-        DocumentStructureProto.DocumentStructure documentStructure =
+        DocumentStructureProto.DocumentStructure documentStructure = DocumentStructureProto.DocumentStructure.parseFrom(documentStructureBytes);
-                DocumentStructureProto.DocumentStructure.parseFrom(documentStructureBytes);
+        DocumentPageProto.AllDocumentPages allDocumentPages = DocumentPageProto.AllDocumentPages.parseFrom(documentPagesBytes);
-        DocumentPageProto.AllDocumentPages allDocumentPages =
+        DocumentTextDataProto.AllDocumentTextData allDocumentTextData = DocumentTextDataProto.AllDocumentTextData.parseFrom(documentTextBytes);
-                DocumentPageProto.AllDocumentPages.parseFrom(documentPagesBytes);
+        DocumentPositionDataProto.AllDocumentPositionData allDocumentPositionData = DocumentPositionDataProto.AllDocumentPositionData.parseFrom(documentPositionBytes);
-        DocumentTextDataProto.AllDocumentTextData allDocumentTextData =
-                DocumentTextDataProto.AllDocumentTextData.parseFrom(documentTextBytes);
-        DocumentPositionDataProto.AllDocumentPositionData allDocumentPositionData =
-                DocumentPositionDataProto.AllDocumentPositionData.parseFrom(documentPositionBytes);
     }
 
 }

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReanalysisTest.java

@@ -1,31 +1,21 @@
 package com.iqser.red.service.peristence.v1.server.integration.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.util.List;
 import java.util.Set;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import com.iqser.red.service.peristence.v1.server.integration.client.FileClient;
 import com.iqser.red.service.peristence.v1.server.integration.client.ReanalysisClient;
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.FileRepository;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.FileStatus;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.ProcessingStatus;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 import com.knecon.fforesight.tenantcommons.TenantContext;
 
 public class ReanalysisTest extends AbstractPersistenceServerServiceTest {
@@ -45,19 +35,6 @@ public class ReanalysisTest extends AbstractPersistenceServerServiceTest {
     @Autowired
     private FileRepository fileRepository;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @Test
     public void testReanalysis() {

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReportTemplateTest.java

@@ -1,18 +1,13 @@
 package com.iqser.red.service.peristence.v1.server.integration.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doNothing;
-import static org.mockito.Mockito.when;
 
 import java.util.List;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import com.iqser.red.service.peristence.v1.server.integration.client.DownloadClient;
 import com.iqser.red.service.peristence.v1.server.integration.client.FileClient;
@@ -22,12 +17,8 @@ import com.iqser.red.service.peristence.v1.server.integration.service.DossierTes
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.ReportTemplateProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.PrepareDownloadWithOptionRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.ReportTemplateUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 
 import feign.FeignException;
 
@@ -54,17 +45,10 @@ public class ReportTemplateTest extends AbstractPersistenceServerServiceTest {
     @Autowired
     private ReportTemplateProvider reportTemplateProvider;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
 
     @BeforeEach
     public void setup() {
 
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
         doNothing().when(reportTemplatePlaceholderClient).evictReportTemplateCache();
     }
 

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/SupportControllerTest.java

@@ -3,8 +3,6 @@ package com.iqser.red.service.peristence.v1.server.integration.tests;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.time.Instant;
 import java.time.OffsetDateTime;
@@ -14,12 +12,8 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient;
 import com.iqser.red.service.peristence.v1.server.integration.client.FileClient;
@@ -28,7 +22,6 @@ import com.iqser.red.service.peristence.v1.server.integration.client.SupportClie
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.management.v1.processor.service.FileStatusManagementService;
 import com.iqser.red.service.persistence.management.v1.processor.service.FileStatusMapper;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.FileStatus;
@@ -39,9 +32,6 @@ import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemp
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.FileErrorInfo;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.ProcessingStatus;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.file.WorkflowStatus;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 
 import feign.FeignException;
 
@@ -68,19 +58,6 @@ public class SupportControllerTest extends AbstractPersistenceServerServiceTest
     @Autowired
     private FileStatusManagementService fileStatusManagementService;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @Test
     public void testReanalysis() {

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/VersionsTest.java

@@ -1,17 +1,13 @@
 package com.iqser.red.service.peristence.v1.server.integration.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
 import java.util.List;
 import java.util.Map;
 
-import org.apache.http.HttpStatus;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 
 import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient;
@@ -20,16 +16,12 @@ import com.iqser.red.service.peristence.v1.server.integration.client.RulesClient
 import com.iqser.red.service.peristence.v1.server.integration.client.VersionClient;
 import com.iqser.red.service.peristence.v1.server.integration.service.DossierTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.CreateTypeValue;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.VersionsResponse;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.legalbasis.LegalBasis;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.DroolsValidationResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUploadRequestModel;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 
 public class VersionsTest extends AbstractPersistenceServerServiceTest {
 
@@ -45,19 +37,6 @@ public class VersionsTest extends AbstractPersistenceServerServiceTest {
     @Autowired
     private LegalBasisMappingClient legalBasisMapClient;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, org.springframework.http.HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @Test
     public void testVersionsResponse() {
@@ -75,7 +54,7 @@ public class VersionsTest extends AbstractPersistenceServerServiceTest {
 
         var rulesUploadRequest = new RulesUploadRequestModel("lorem ipsum", dossier.getDossierTemplateId(), RuleFileType.ENTITY, false);
         ResponseEntity<DroolsValidationResponse> rulesResponse = rulesClient.upload(rulesUploadRequest);
-        assertThat(rulesResponse.getStatusCode().value()).isEqualTo(HttpStatus.SC_OK);
+        assertThat(rulesResponse.getStatusCode().value()).isEqualTo(HttpStatus.OK);
 
         dictionaryClient.addType(CreateTypeValue.builder()
                                          .type("type_dossier")

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ViewedPagesTest.java

@@ -1,15 +1,9 @@
 package com.iqser.red.service.peristence.v1.server.integration.tests;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.when;
 
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
 
 import com.iqser.red.service.peristence.v1.server.integration.client.FileClient;
 import com.iqser.red.service.peristence.v1.server.integration.client.ViewedPagesClient;
@@ -17,12 +11,8 @@ import com.iqser.red.service.peristence.v1.server.integration.service.DossierTes
 import com.iqser.red.service.peristence.v1.server.integration.service.FileTesterAndProvider;
 import com.iqser.red.service.peristence.v1.server.integration.service.UserProvider;
 import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest;
-import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RuleBuilderClient;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.ViewedPagesRequest;
 import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ViewedPage;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesResponse;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.RulesUpdateRequest;
-import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.rules.SystemRulesSeperationRequest;
 
 public class ViewedPagesTest extends AbstractPersistenceServerServiceTest {
 
@@ -41,19 +31,6 @@ public class ViewedPagesTest extends AbstractPersistenceServerServiceTest {
     @Autowired
     private FileClient fileClient;
 
-    @MockBean
-    private RuleBuilderClient ruleBuilderClient;
-
-
-    @BeforeEach
-    void setup() {
-
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
-        when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
-        when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
-
-    }
-
 
     @Test
     public void testViewedPages() {

persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java

@@ -377,7 +377,7 @@ public abstract class AbstractPersistenceServerServiceTest {
                                                                           .deprecatedWarnings(Collections.emptyList())
                                                                           .build());
 
-        RulesResponse rulesResponse = new RulesResponse("some rules", "Template 1", false);
+        RulesResponse rulesResponse = new RulesResponse("lorem ipsum", "Template 1", false);
         when(ruleBuilderClient.mergeUserUpdateRules(any(RulesUpdateRequest.class))).thenReturn(new ResponseEntity(rulesResponse, HttpStatus.OK));
         when(ruleBuilderClient.getRuleFileWithoutSystemRules(any(SystemRulesSeperationRequest.class))).thenReturn(rulesResponse);
     }