From 67f7d8a7d047ce8bee2a2f564f604de4501770ac Mon Sep 17 00:00:00 2001 From: maverickstuder Date: Wed, 20 Mar 2024 12:05:34 +0100 Subject: [PATCH] RED-8702: Explore document databases to store entityLog * refactoring --- .../server/Application.java | 2 +- .../server/SpringDocRedirectController.java | 2 +- .../client/ApplicationConfigClient.java | 2 +- .../integration/client/AuditClient.java | 2 +- .../client/CustomPermissionClient.java | 2 +- .../integration/client/DictionaryClient.java | 2 +- .../client/DigitalSignatureClient.java | 2 +- .../client/DossierAttributeClient.java | 2 +- .../client/DossierAttributeConfigClient.java | 2 +- .../integration/client/DossierClient.java | 2 +- .../client/DossierStatsClient.java | 2 +- .../client/DossierStatusClient.java | 2 +- .../client/DossierTemplateClient.java | 2 +- .../client/DossierTemplateStatsClient.java | 2 +- .../integration/client/DownloadClient.java | 2 +- .../integration/client/EntityLogClient.java | 2 +- .../client/FeignSupportConfig.java | 2 +- .../client/FileAttributeClient.java | 2 +- .../client/FileAttributeConfigClient.java | 2 +- .../server/integration/client/FileClient.java | 2 +- .../client/FileManagementClient.java | 2 +- .../client/FileProcessingClient.java | 2 +- .../client/IndexInformationClient.java | 2 +- .../client/InternalDictionaryClient.java | 2 +- .../integration/client/LegalBasisClient.java | 2 +- .../client/LicenseReportClient.java | 2 +- .../client/ManualRedactionClient.java | 2 +- .../client/NotificationClient.java | 2 +- .../client/NotificationPreferencesClient.java | 2 +- .../integration/client/ReanalysisClient.java | 2 +- .../client/RedactionLogClient.java | 2 +- .../client/ReportTemplateClient.java | 2 +- .../integration/client/RulesClient.java | 2 +- .../integration/client/UploadClient.java | 2 +- .../integration/client/VersionClient.java | 2 +- .../integration/client/ViewedPagesClient.java | 2 +- .../integration/client/WatermarkClient.java | 2 +- .../DossierTemplateTesterAndProvider.java | 10 +++--- .../service/DossierTesterAndProvider.java | 4 +-- .../service/FileTesterAndProvider.java | 6 ++-- .../service/ReportTemplateProvider.java | 4 +-- .../integration/service/TypeProvider.java | 4 +-- .../integration/service/UserProvider.java | 2 +- .../tests/ApplicationConfigTest.java | 6 ++-- .../server/integration/tests/AuditTest.java | 8 ++--- .../tests/CustomPermissionTest.java | 15 ++------ .../integration/tests/DictionaryTest.java | 14 ++++---- .../tests/DigitalSignatureTest.java | 7 ++-- .../tests/DossierAttributeTest.java | 10 +++--- .../integration/tests/DossierStatsTest.java | 16 ++++----- .../integration/tests/DossierStatusTest.java | 12 +++---- ...eCloneAndExportWithDuplicateRanksTest.java | 2 +- .../tests/DossierTemplateImportTest.java | 6 ++-- .../tests/DossierTemplateStatsTest.java | 30 ++++++++-------- .../tests/DossierTemplateTest.java | 28 +++++++-------- .../server/integration/tests/DossierTest.java | 20 +++++------ .../tests/DownloadPreparationTest.java | 18 +++++----- .../integration/tests/DownloadTest.java | 15 ++++---- .../integration/tests/EntityLogMergeTest.java | 2 +- .../integration/tests/FileAttributeTest.java | 18 +++++----- .../integration/tests/FileProcessingTest.java | 20 +++++------ .../server/integration/tests/FileTest.java | 34 +++++++++---------- .../tests/IndexInformationTest.java | 6 ++-- .../integration/tests/LegalBasisTest.java | 10 +++--- .../integration/tests/LicenseReportTest.java | 12 +++---- .../tests/ManualRedactionTest.java | 28 +++++++-------- .../NotificationPreferencesServiceTest.java | 6 ++-- .../tests/NotificationPreferencesTest.java | 6 ++-- .../integration/tests/NotificationTest.java | 12 +++---- .../integration/tests/ReanalysisTest.java | 12 +++---- .../tests/ReduceFileSizeMigrationTest.java | 4 +-- .../integration/tests/ReportTemplateTest.java | 10 +++--- .../server/integration/tests/RulesTest.java | 10 +++--- .../tests/StringCleaningUtilityTest.java | 2 +- .../server/integration/tests/TypeTest.java | 13 ++++--- .../integration/tests/ViewedPagesTest.java | 15 ++++---- .../integration/tests/WatermarkTest.java | 12 +++---- .../performance/EntityPerformanceTest.java | 12 +++---- .../performance/FilePerformanceTest.java | 10 +++--- .../performance/PerformanceTestService.java | 10 +++--- .../AbstractPersistenceServerServiceTest.java | 10 +++--- .../utils/FeignRequestInterceptor.java | 2 +- .../utils/KneconRedisTestContainer.java | 2 +- .../KneconSpringPostgreSQLTestContainer.java | 2 +- .../utils/MetricValidationUtils.java | 2 +- .../utils/MongoDBTestContainer.java | 2 +- .../utils/MultithreadedTestRunner.java | 2 +- .../integration/utils/RedisTestContainer.java | 2 +- .../utils/SpringPostgreSQLTestContainer.java | 2 +- .../integration/utils/TokenService.java | 2 +- .../utils/FileSystemBackArchiverTest.java | 2 +- .../server/utils/MetricsPrinterService.java | 2 +- 92 files changed, 295 insertions(+), 312 deletions(-) rename persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/{peristence/v1 => persistence}/server/Application.java (99%) rename persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/{peristence/v1 => persistence}/server/SpringDocRedirectController.java (96%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/ApplicationConfigClient.java (82%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/AuditClient.java (79%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/CustomPermissionClient.java (85%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/DictionaryClient.java (80%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/DigitalSignatureClient.java (82%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/DossierAttributeClient.java (82%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/DossierAttributeConfigClient.java (82%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/DossierClient.java (79%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/DossierStatsClient.java (80%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/DossierStatusClient.java (81%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/DossierTemplateClient.java (83%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/DossierTemplateStatsClient.java (82%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/DownloadClient.java (82%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/EntityLogClient.java (80%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/FeignSupportConfig.java (89%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/FileAttributeClient.java (81%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/FileAttributeConfigClient.java (82%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/FileClient.java (79%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/FileManagementClient.java (81%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/FileProcessingClient.java (82%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/IndexInformationClient.java (82%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/InternalDictionaryClient.java (81%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/LegalBasisClient.java (81%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/LicenseReportClient.java (81%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/ManualRedactionClient.java (81%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/NotificationClient.java (81%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/NotificationPreferencesClient.java (83%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/ReanalysisClient.java (80%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/RedactionLogClient.java (81%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/ReportTemplateClient.java (83%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/RulesClient.java (79%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/UploadClient.java (82%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/VersionClient.java (80%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/ViewedPagesClient.java (81%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/client/WatermarkClient.java (80%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/service/DossierTemplateTesterAndProvider.java (87%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/service/DossierTesterAndProvider.java (95%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/service/FileTesterAndProvider.java (95%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/service/ReportTemplateProvider.java (91%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/service/TypeProvider.java (93%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/service/UserProvider.java (88%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/ApplicationConfigTest.java (89%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/AuditTest.java (88%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/CustomPermissionTest.java (76%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/DictionaryTest.java (98%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/DigitalSignatureTest.java (94%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/DossierAttributeTest.java (97%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/DossierStatsTest.java (91%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/DossierStatusTest.java (91%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/DossierTemplateCloneAndExportWithDuplicateRanksTest.java (99%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/DossierTemplateImportTest.java (95%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/DossierTemplateStatsTest.java (92%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/DossierTemplateTest.java (97%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/DossierTest.java (96%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/DownloadPreparationTest.java (93%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/DownloadTest.java (90%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/EntityLogMergeTest.java (99%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/FileAttributeTest.java (95%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/FileProcessingTest.java (92%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/FileTest.java (95%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/IndexInformationTest.java (90%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/LegalBasisTest.java (87%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/LicenseReportTest.java (91%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/ManualRedactionTest.java (98%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/NotificationPreferencesServiceTest.java (86%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/NotificationPreferencesTest.java (93%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/NotificationTest.java (92%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/ReanalysisTest.java (87%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/ReduceFileSizeMigrationTest.java (90%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/ReportTemplateTest.java (96%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/RulesTest.java (95%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/StringCleaningUtilityTest.java (95%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/TypeTest.java (88%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/ViewedPagesTest.java (73%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/WatermarkTest.java (95%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/performance/EntityPerformanceTest.java (91%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/performance/FilePerformanceTest.java (83%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/tests/performance/PerformanceTestService.java (96%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/utils/AbstractPersistenceServerServiceTest.java (98%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/utils/FeignRequestInterceptor.java (90%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/utils/KneconRedisTestContainer.java (90%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/utils/KneconSpringPostgreSQLTestContainer.java (97%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/utils/MetricValidationUtils.java (94%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/utils/MongoDBTestContainer.java (93%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/utils/MultithreadedTestRunner.java (96%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/utils/RedisTestContainer.java (89%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/utils/SpringPostgreSQLTestContainer.java (89%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/integration/utils/TokenService.java (86%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/utils/FileSystemBackArchiverTest.java (97%) rename persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/{peristence/v1 => persistence}/server/utils/MetricsPrinterService.java (98%) diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/Application.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/persistence/server/Application.java similarity index 99% rename from persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/Application.java rename to persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/persistence/server/Application.java index a90522e03..c448ad01e 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/Application.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/persistence/server/Application.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server; +package com.iqser.red.service.persistence.server; import java.util.Map; import java.util.Optional; diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/SpringDocRedirectController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/persistence/server/SpringDocRedirectController.java similarity index 96% rename from persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/SpringDocRedirectController.java rename to persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/persistence/server/SpringDocRedirectController.java index 132397d52..09cfbd64e 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/SpringDocRedirectController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/persistence/server/SpringDocRedirectController.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server; +package com.iqser.red.service.persistence.server; import com.knecon.fforesight.swaggercommons.SpringDocProperties; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ApplicationConfigClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ApplicationConfigClient.java similarity index 82% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ApplicationConfigClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ApplicationConfigClient.java index a2e26efd8..144d9463a 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ApplicationConfigClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ApplicationConfigClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/AuditClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/AuditClient.java similarity index 79% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/AuditClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/AuditClient.java index 040693e4a..ce3f89bca 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/AuditClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/AuditClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/CustomPermissionClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/CustomPermissionClient.java similarity index 85% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/CustomPermissionClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/CustomPermissionClient.java index e94a11325..d1a5446dc 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/CustomPermissionClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/CustomPermissionClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DictionaryClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DictionaryClient.java similarity index 80% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DictionaryClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DictionaryClient.java index 5a9935a25..c39d3d32f 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DictionaryClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DictionaryClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DigitalSignatureClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DigitalSignatureClient.java similarity index 82% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DigitalSignatureClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DigitalSignatureClient.java index 47f203f62..4dd9ec7f8 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DigitalSignatureClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DigitalSignatureClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierAttributeClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierAttributeClient.java similarity index 82% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierAttributeClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierAttributeClient.java index 035e44773..491a506a9 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierAttributeClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierAttributeClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierAttributeConfigClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierAttributeConfigClient.java similarity index 82% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierAttributeConfigClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierAttributeConfigClient.java index 8cccd891e..16ef26889 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierAttributeConfigClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierAttributeConfigClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierClient.java similarity index 79% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierClient.java index 20126e3a5..19bc26fee 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierStatsClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierStatsClient.java similarity index 80% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierStatsClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierStatsClient.java index eaac5c99d..31cfd0e93 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierStatsClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierStatsClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierStatusClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierStatusClient.java similarity index 81% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierStatusClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierStatusClient.java index 0fb5533ef..9f0d80b35 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierStatusClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierStatusClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierTemplateClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierTemplateClient.java similarity index 83% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierTemplateClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierTemplateClient.java index b9d794dcf..6d162fdbe 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierTemplateClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierTemplateClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierTemplateStatsClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierTemplateStatsClient.java similarity index 82% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierTemplateStatsClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierTemplateStatsClient.java index fdd3a3151..81541b09c 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DossierTemplateStatsClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DossierTemplateStatsClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DownloadClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DownloadClient.java similarity index 82% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DownloadClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DownloadClient.java index b9244a32f..5bbe74c54 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/DownloadClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/DownloadClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/EntityLogClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/EntityLogClient.java similarity index 80% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/EntityLogClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/EntityLogClient.java index daa7d305d..9a3a6fd48 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/EntityLogClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/EntityLogClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FeignSupportConfig.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FeignSupportConfig.java similarity index 89% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FeignSupportConfig.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FeignSupportConfig.java index e158bf918..c1fabd824 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FeignSupportConfig.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FeignSupportConfig.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import java.util.Collections; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileAttributeClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileAttributeClient.java similarity index 81% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileAttributeClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileAttributeClient.java index a93e88e8e..cfd534271 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileAttributeClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileAttributeClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileAttributeConfigClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileAttributeConfigClient.java similarity index 82% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileAttributeConfigClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileAttributeConfigClient.java index 9599c078c..49554dd1c 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileAttributeConfigClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileAttributeConfigClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileClient.java similarity index 79% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileClient.java index 603071855..11a10ddce 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileManagementClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileManagementClient.java similarity index 81% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileManagementClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileManagementClient.java index 9bf188cb2..d55e0607f 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileManagementClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileManagementClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileProcessingClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileProcessingClient.java similarity index 82% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileProcessingClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileProcessingClient.java index 275523808..03a5cba5e 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/FileProcessingClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/FileProcessingClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/IndexInformationClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/IndexInformationClient.java similarity index 82% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/IndexInformationClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/IndexInformationClient.java index fece04d58..16f7df303 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/IndexInformationClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/IndexInformationClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/InternalDictionaryClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/InternalDictionaryClient.java similarity index 81% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/InternalDictionaryClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/InternalDictionaryClient.java index 5f362f75d..e2c29aa24 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/InternalDictionaryClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/InternalDictionaryClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/LegalBasisClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/LegalBasisClient.java similarity index 81% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/LegalBasisClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/LegalBasisClient.java index cb0bfedd3..97e5804af 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/LegalBasisClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/LegalBasisClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/LicenseReportClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/LicenseReportClient.java similarity index 81% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/LicenseReportClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/LicenseReportClient.java index cfba25cd1..47c8585f7 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/LicenseReportClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/LicenseReportClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ManualRedactionClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ManualRedactionClient.java similarity index 81% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ManualRedactionClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ManualRedactionClient.java index a0ec87514..9cc71e400 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ManualRedactionClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ManualRedactionClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/NotificationClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/NotificationClient.java similarity index 81% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/NotificationClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/NotificationClient.java index efa7f4090..99441bbe8 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/NotificationClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/NotificationClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/NotificationPreferencesClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/NotificationPreferencesClient.java similarity index 83% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/NotificationPreferencesClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/NotificationPreferencesClient.java index fb39bbacb..7e6b5d6fa 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/NotificationPreferencesClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/NotificationPreferencesClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ReanalysisClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ReanalysisClient.java similarity index 80% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ReanalysisClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ReanalysisClient.java index a2b406e06..083be0340 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ReanalysisClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ReanalysisClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/RedactionLogClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/RedactionLogClient.java similarity index 81% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/RedactionLogClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/RedactionLogClient.java index 3f3abbf38..4c6c3628d 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/RedactionLogClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/RedactionLogClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ReportTemplateClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ReportTemplateClient.java similarity index 83% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ReportTemplateClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ReportTemplateClient.java index 6e6de9328..dd853983a 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ReportTemplateClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ReportTemplateClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/RulesClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/RulesClient.java similarity index 79% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/RulesClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/RulesClient.java index ca7db745e..5a0042e7e 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/RulesClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/RulesClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/UploadClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/UploadClient.java similarity index 82% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/UploadClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/UploadClient.java index 7b467cd7c..ad4c1ebbc 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/UploadClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/UploadClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/VersionClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/VersionClient.java similarity index 80% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/VersionClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/VersionClient.java index 908b76d05..b4adea390 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/VersionClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/VersionClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ViewedPagesClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ViewedPagesClient.java similarity index 81% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ViewedPagesClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ViewedPagesClient.java index 3921b5bb1..9c95f944e 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/ViewedPagesClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/ViewedPagesClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/WatermarkClient.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/WatermarkClient.java similarity index 80% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/WatermarkClient.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/WatermarkClient.java index 00ab23125..35bd7d485 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/client/WatermarkClient.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/client/WatermarkClient.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.client; +package com.iqser.red.service.persistence.server.integration.client; import org.springframework.cloud.openfeign.FeignClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/DossierTemplateTesterAndProvider.java similarity index 87% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/DossierTemplateTesterAndProvider.java index 91e5e20b4..ced233b3b 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTemplateTesterAndProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/DossierTemplateTesterAndProvider.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.service; +package com.iqser.red.service.persistence.server.integration.service; import static org.assertj.core.api.Assertions.assertThat; @@ -10,10 +10,10 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.google.common.collect.Sets; -import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemplateClient; -import com.iqser.red.service.peristence.v1.server.integration.client.LegalBasisClient; -import com.iqser.red.service.peristence.v1.server.integration.client.RulesClient; +import com.iqser.red.service.persistence.server.integration.client.DictionaryClient; +import com.iqser.red.service.persistence.server.integration.client.DossierTemplateClient; +import com.iqser.red.service.persistence.server.integration.client.LegalBasisClient; +import com.iqser.red.service.persistence.server.integration.client.RulesClient; import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierTemplateModel; import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DownloadFileType; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTesterAndProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/DossierTesterAndProvider.java similarity index 95% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTesterAndProvider.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/DossierTesterAndProvider.java index a0ef0809a..3abf51e14 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/DossierTesterAndProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/DossierTesterAndProvider.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.service; +package com.iqser.red.service.persistence.server.integration.service; import static org.assertj.core.api.Assertions.assertThat; @@ -10,7 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.google.common.collect.Sets; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient; +import com.iqser.red.service.persistence.server.integration.client.DossierClient; import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierTemplateModel; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DownloadFileType; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/FileTesterAndProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/FileTesterAndProvider.java similarity index 95% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/FileTesterAndProvider.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/FileTesterAndProvider.java index d702fb1c6..7fe7c8c66 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/FileTesterAndProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/FileTesterAndProvider.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.service; +package com.iqser.red.service.persistence.server.integration.service; import static org.assertj.core.api.Assertions.assertThat; @@ -12,8 +12,8 @@ import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; import com.fasterxml.jackson.databind.ObjectMapper; -import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; -import com.iqser.red.service.peristence.v1.server.integration.client.UploadClient; +import com.iqser.red.service.persistence.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.integration.client.UploadClient; import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService; import com.iqser.red.service.persistence.management.v1.processor.service.FileStatusService; import com.iqser.red.service.persistence.service.v1.api.shared.model.AnalyzeResult; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/ReportTemplateProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/ReportTemplateProvider.java similarity index 91% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/ReportTemplateProvider.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/ReportTemplateProvider.java index 37fc8f5d4..8d628effc 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/ReportTemplateProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/ReportTemplateProvider.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.service; +package com.iqser.red.service.persistence.server.integration.service; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; @@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; -import com.iqser.red.service.peristence.v1.server.integration.client.ReportTemplateClient; +import com.iqser.red.service.persistence.server.integration.client.ReportTemplateClient; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.ReportTemplate; @Service diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/TypeProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/TypeProvider.java similarity index 93% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/TypeProvider.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/TypeProvider.java index 047cf00ff..8e61445bd 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/TypeProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/TypeProvider.java @@ -1,11 +1,11 @@ -package com.iqser.red.service.peristence.v1.server.integration.service; +package com.iqser.red.service.persistence.server.integration.service; import static org.assertj.core.api.Assertions.assertThat; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient; +import com.iqser.red.service.persistence.server.integration.client.DictionaryClient; import com.iqser.red.service.persistence.service.v1.api.shared.model.CreateTypeValue; import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierTemplateModel; import com.iqser.red.service.persistence.service.v1.api.shared.model.TypeValue; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/UserProvider.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/UserProvider.java similarity index 88% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/UserProvider.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/UserProvider.java index bda4151cb..04464511b 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/service/UserProvider.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/service/UserProvider.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.service; +package com.iqser.red.service.persistence.server.integration.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ApplicationConfigTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ApplicationConfigTest.java similarity index 89% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ApplicationConfigTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ApplicationConfigTest.java index 79b6ff16c..791581fb8 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ApplicationConfigTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ApplicationConfigTest.java @@ -1,12 +1,12 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.ApplicationConfigClient; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.client.ApplicationConfigClient; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.ApplicationConfig; public class ApplicationConfigTest extends AbstractPersistenceServerServiceTest { diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/AuditTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/AuditTest.java similarity index 88% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/AuditTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/AuditTest.java index 9946b3966..3f5a3e475 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/AuditTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/AuditTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -7,9 +7,9 @@ import java.util.Map; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.AuditClient; -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.server.integration.client.AuditClient; +import com.iqser.red.service.persistence.server.integration.service.UserProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.AuditPersistenceService; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.AuditRepository; import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AuditRequest; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/CustomPermissionTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/CustomPermissionTest.java similarity index 76% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/CustomPermissionTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/CustomPermissionTest.java index 38f5d7d97..58454fbc5 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/CustomPermissionTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/CustomPermissionTest.java @@ -1,22 +1,13 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; - -import static com.iqser.red.service.persistence.management.v1.processor.roles.ActionRoles.MANAGE_ACL_PERMISSIONS; -import static com.iqser.red.service.persistence.service.v1.api.external.resource.CustomPermissionMappingResource.PERMISSION_REST_PATH; -import static com.iqser.red.service.persistence.service.v1.api.external.resource.CustomPermissionMappingResource.TARGET_OBJECT_VARIABLE; -import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +package com.iqser.red.service.persistence.server.integration.tests; import java.util.ArrayList; import java.util.List; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.http.MediaType; -import org.springframework.security.test.context.support.WithMockUser; -import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import com.iqser.red.service.peristence.v1.server.integration.client.CustomPermissionClient; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.client.CustomPermissionClient; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.management.v1.processor.acl.RedPermission; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.constants.CustomPermissionConstants; import com.iqser.red.service.persistence.service.v1.api.shared.model.permission.CustomPermissionMappingModel; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DictionaryTest.java similarity index 98% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DictionaryTest.java index b016ba95d..c09b8de60 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DictionaryTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DictionaryTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -13,12 +13,12 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemplateClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.server.integration.client.DictionaryClient; +import com.iqser.red.service.persistence.server.integration.client.DossierTemplateClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.TypeProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.management.v1.processor.service.DictionaryService; import com.iqser.red.service.persistence.service.v1.api.shared.model.CreateTypeValue; import com.iqser.red.service.persistence.service.v1.api.shared.model.Dictionary; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DigitalSignatureTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DigitalSignatureTest.java similarity index 94% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DigitalSignatureTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DigitalSignatureTest.java index d5394986a..55651b048 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DigitalSignatureTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DigitalSignatureTest.java @@ -1,8 +1,7 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; -import java.nio.charset.StandardCharsets; import java.nio.file.Files; import org.junit.jupiter.api.Test; @@ -10,8 +9,8 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; -import com.iqser.red.service.peristence.v1.server.integration.client.DigitalSignatureClient; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.client.DigitalSignatureClient; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.service.v1.api.shared.model.DigitalSignatureKms; import com.iqser.red.service.persistence.service.v1.api.shared.model.DigitalSignatureViewModel; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.DigitalSignature; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierAttributeTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierAttributeTest.java similarity index 97% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierAttributeTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierAttributeTest.java index 49014a429..24a4132d2 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierAttributeTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierAttributeTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -12,10 +12,10 @@ import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -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.server.integration.client.DossierAttributeClient; +import com.iqser.red.service.persistence.server.integration.client.DossierAttributeConfigClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; 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; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierStatsTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierStatsTest.java similarity index 91% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierStatsTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierStatsTest.java index 7df03e79d..c939e6404 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierStatsTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierStatsTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -12,13 +12,13 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierStatsClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.server.integration.client.DossierClient; +import com.iqser.red.service.persistence.server.integration.client.DossierStatsClient; +import com.iqser.red.service.persistence.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.FileTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierStats; 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.ProcessingStatus; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierStatusTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierStatusTest.java similarity index 91% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierStatusTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierStatusTest.java index ebb424117..5532348e8 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierStatusTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierStatusTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -6,11 +6,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierStatusClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.server.integration.client.DossierClient; +import com.iqser.red.service.persistence.server.integration.client.DossierStatusClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierStatusRequest; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateCloneAndExportWithDuplicateRanksTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTemplateCloneAndExportWithDuplicateRanksTest.java similarity index 99% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateCloneAndExportWithDuplicateRanksTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTemplateCloneAndExportWithDuplicateRanksTest.java index ec5c1ba81..265d6c817 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateCloneAndExportWithDuplicateRanksTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTemplateCloneAndExportWithDuplicateRanksTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static com.iqser.red.service.persistence.management.v1.processor.utils.TypeIdUtils.toTypeId; import static org.mockito.ArgumentMatchers.eq; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTemplateImportTest.java similarity index 95% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTemplateImportTest.java index 232d8cc6d..f9f9bf7dd 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateImportTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTemplateImportTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -19,8 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import org.springframework.mock.web.MockMultipartFile; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemplateClient; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.client.DossierTemplateClient; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.management.v1.processor.service.DossierTemplateManagementService; import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierTemplateModel; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.DossierTemplate; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateStatsTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTemplateStatsTest.java similarity index 92% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateStatsTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTemplateStatsTest.java index fb7674c77..5f70de0af 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateStatsTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTemplateStatsTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -13,20 +13,20 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import com.google.common.collect.Sets; -import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierStatusClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemplateClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemplateStatsClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileManagementClient; -import com.iqser.red.service.peristence.v1.server.integration.client.ReanalysisClient; -import com.iqser.red.service.peristence.v1.server.integration.client.UploadClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.service.UserProvider; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.client.DictionaryClient; +import com.iqser.red.service.persistence.server.integration.client.DossierClient; +import com.iqser.red.service.persistence.server.integration.client.DossierStatusClient; +import com.iqser.red.service.persistence.server.integration.client.DossierTemplateClient; +import com.iqser.red.service.persistence.server.integration.client.DossierTemplateStatsClient; +import com.iqser.red.service.persistence.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.integration.client.FileManagementClient; +import com.iqser.red.service.persistence.server.integration.client.ReanalysisClient; +import com.iqser.red.service.persistence.server.integration.client.UploadClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.FileTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.UserProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; 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; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTemplateTest.java similarity index 97% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTemplateTest.java index 4109b40a6..fb013023d 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTemplateTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTemplateTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertThrows; @@ -36,19 +36,19 @@ import org.springframework.mock.web.MockMultipartFile; import com.fasterxml.jackson.databind.ObjectMapper; import com.google.common.collect.Sets; -import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierAttributeConfigClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierStatusClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemplateClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DownloadClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileAttributeConfigClient; -import com.iqser.red.service.peristence.v1.server.integration.client.LegalBasisClient; -import com.iqser.red.service.peristence.v1.server.integration.client.ReportTemplateClient; -import com.iqser.red.service.peristence.v1.server.integration.client.WatermarkClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.server.integration.client.DictionaryClient; +import com.iqser.red.service.persistence.server.integration.client.DossierAttributeConfigClient; +import com.iqser.red.service.persistence.server.integration.client.DossierClient; +import com.iqser.red.service.persistence.server.integration.client.DossierStatusClient; +import com.iqser.red.service.persistence.server.integration.client.DossierTemplateClient; +import com.iqser.red.service.persistence.server.integration.client.DownloadClient; +import com.iqser.red.service.persistence.server.integration.client.FileAttributeConfigClient; +import com.iqser.red.service.persistence.server.integration.client.LegalBasisClient; +import com.iqser.red.service.persistence.server.integration.client.ReportTemplateClient; +import com.iqser.red.service.persistence.server.integration.client.WatermarkClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.management.v1.processor.exception.BadRequestException; import com.iqser.red.service.persistence.management.v1.processor.model.DownloadJob; import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTest.java similarity index 96% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTest.java index f87d39a54..e0bd06aa2 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DossierTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DossierTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -15,15 +15,15 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.mock.web.MockMultipartFile; import com.google.common.collect.Sets; -import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierStatusClient; -import com.iqser.red.service.peristence.v1.server.integration.client.ReportTemplateClient; -import com.iqser.red.service.peristence.v1.server.integration.client.WatermarkClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.server.integration.client.DictionaryClient; +import com.iqser.red.service.persistence.server.integration.client.DossierClient; +import com.iqser.red.service.persistence.server.integration.client.DossierStatusClient; +import com.iqser.red.service.persistence.server.integration.client.ReportTemplateClient; +import com.iqser.red.service.persistence.server.integration.client.WatermarkClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.TypeProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; 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; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DownloadPreparationTest.java similarity index 93% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DownloadPreparationTest.java index fe9391237..82fd5769d 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadPreparationTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DownloadPreparationTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; @@ -16,14 +16,14 @@ import org.springframework.mock.web.MockMultipartFile; import com.fasterxml.jackson.databind.ObjectMapper; import com.iqser.red.service.pdftron.redaction.v1.api.model.RedactionResultMessage; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DownloadClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; -import com.iqser.red.service.peristence.v1.server.integration.client.ReportTemplateClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.server.integration.client.DossierClient; +import com.iqser.red.service.persistence.server.integration.client.DownloadClient; +import com.iqser.red.service.persistence.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.integration.client.ReportTemplateClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.FileTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.management.v1.processor.model.DownloadJob; import com.iqser.red.service.persistence.management.v1.processor.service.download.DownloadCompressionMessageReceiver; import com.iqser.red.service.persistence.management.v1.processor.service.download.DownloadReportMessageReceiver; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DownloadTest.java similarity index 90% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DownloadTest.java index 42f473d6e..d6f6eb4fa 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/DownloadTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/DownloadTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -9,6 +9,12 @@ import java.util.Set; import com.iqser.red.service.pdftron.redaction.v1.api.model.RedactionResultDetail; import com.iqser.red.service.pdftron.redaction.v1.api.model.RedactionType; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DownloadRedactionFileStatusRepository; +import com.iqser.red.service.persistence.server.integration.client.DownloadClient; +import com.iqser.red.service.persistence.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.FileTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.UserProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.knecon.fforesight.tenantcommons.EncryptionDecryptionService; import org.junit.jupiter.api.Disabled; @@ -17,16 +23,9 @@ import org.springframework.beans.factory.annotation.Autowired; import com.fasterxml.jackson.databind.ObjectMapper; import com.iqser.red.service.pdftron.redaction.v1.api.model.RedactionResultMessage; -import com.iqser.red.service.peristence.v1.server.integration.client.DownloadClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; -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.service.UserProvider; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; 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; -import com.iqser.red.service.persistence.service.v1.api.shared.model.PrepareDownloadRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.PrepareDownloadWithOptionRequest; 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; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/EntityLogMergeTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/EntityLogMergeTest.java similarity index 99% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/EntityLogMergeTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/EntityLogMergeTest.java index 7a041bc58..98de30465 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/EntityLogMergeTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/EntityLogMergeTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileAttributeTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/FileAttributeTest.java similarity index 95% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileAttributeTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/FileAttributeTest.java index 98437df2b..6cc0857c0 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileAttributeTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/FileAttributeTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static com.iqser.red.service.persistence.management.v1.processor.service.FileAttributesManagementService.ASCII_ENCODING; import static com.iqser.red.service.persistence.management.v1.processor.service.FileAttributesManagementService.UTF_ENCODING; @@ -19,14 +19,14 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import org.springframework.mock.web.MockMultipartFile; -import com.iqser.red.service.peristence.v1.server.integration.client.FileAttributeClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileAttributeConfigClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileManagementClient; -import com.iqser.red.service.peristence.v1.server.integration.client.UploadClient; -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.server.integration.client.FileAttributeClient; +import com.iqser.red.service.persistence.server.integration.client.FileAttributeConfigClient; +import com.iqser.red.service.persistence.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.integration.client.FileManagementClient; +import com.iqser.red.service.persistence.server.integration.client.UploadClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.FileTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; 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; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileProcessingTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/FileProcessingTest.java similarity index 92% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileProcessingTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/FileProcessingTest.java index 008235811..aba741f88 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileProcessingTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/FileProcessingTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -9,15 +9,15 @@ import java.util.List; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileManagementClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileProcessingClient; -import com.iqser.red.service.peristence.v1.server.integration.client.ReanalysisClient; -import com.iqser.red.service.peristence.v1.server.integration.client.UploadClient; -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.service.UserProvider; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.integration.client.FileManagementClient; +import com.iqser.red.service.persistence.server.integration.client.FileProcessingClient; +import com.iqser.red.service.persistence.server.integration.client.ReanalysisClient; +import com.iqser.red.service.persistence.server.integration.client.UploadClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.FileTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.UserProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; 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; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/FileTest.java similarity index 95% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/FileTest.java index fe831f9d0..7af0b87e7 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/FileTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/FileTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.any; @@ -22,22 +22,22 @@ import org.springframework.mock.web.MockMultipartFile; import com.google.common.collect.Sets; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemplateClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileAttributeClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileAttributeConfigClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileManagementClient; -import com.iqser.red.service.peristence.v1.server.integration.client.ManualRedactionClient; -import com.iqser.red.service.peristence.v1.server.integration.client.ReanalysisClient; -import com.iqser.red.service.peristence.v1.server.integration.client.UploadClient; -import com.iqser.red.service.peristence.v1.server.integration.client.ViewedPagesClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.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.server.integration.client.DossierClient; +import com.iqser.red.service.persistence.server.integration.client.DossierTemplateClient; +import com.iqser.red.service.persistence.server.integration.client.FileAttributeClient; +import com.iqser.red.service.persistence.server.integration.client.FileAttributeConfigClient; +import com.iqser.red.service.persistence.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.integration.client.FileManagementClient; +import com.iqser.red.service.persistence.server.integration.client.ManualRedactionClient; +import com.iqser.red.service.persistence.server.integration.client.ReanalysisClient; +import com.iqser.red.service.persistence.server.integration.client.UploadClient; +import com.iqser.red.service.persistence.server.integration.client.ViewedPagesClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.FileTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.TypeProvider; +import com.iqser.red.service.persistence.server.integration.service.UserProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService; import com.iqser.red.service.persistence.management.v1.processor.service.FileStatusService; import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierTemplateModel; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/IndexInformationTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/IndexInformationTest.java similarity index 90% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/IndexInformationTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/IndexInformationTest.java index e61e6c0fe..6bae46aca 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/IndexInformationTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/IndexInformationTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -8,8 +8,8 @@ import java.time.temporal.ChronoUnit; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.IndexInformationClient; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.client.IndexInformationClient; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.IndexInformationRepository; import com.iqser.red.service.persistence.service.v1.api.shared.model.index.IndexInformation; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LegalBasisTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/LegalBasisTest.java similarity index 87% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LegalBasisTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/LegalBasisTest.java index 0fbb86efe..baf23c436 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LegalBasisTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/LegalBasisTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -9,10 +9,10 @@ import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.LegalBasisClient; -import com.iqser.red.service.peristence.v1.server.integration.client.VersionClient; -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.server.integration.client.LegalBasisClient; +import com.iqser.red.service.persistence.server.integration.client.VersionClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.legalbasis.LegalBasis; import feign.FeignException; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LicenseReportTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/LicenseReportTest.java similarity index 91% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LicenseReportTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/LicenseReportTest.java index e2f796699..0fbd7e20a 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/LicenseReportTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/LicenseReportTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -9,11 +9,11 @@ import java.time.ZoneId; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.LicenseReportClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.server.integration.client.LicenseReportClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.FileTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.DossierRepository; 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; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ManualRedactionTest.java similarity index 98% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ManualRedactionTest.java index 7672880cc..7f2cec30e 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ManualRedactionTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ManualRedactionTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static com.iqser.red.service.persistence.management.v1.processor.utils.TypeIdUtils.toTypeId; import static org.assertj.core.api.Assertions.assertThat; @@ -21,17 +21,17 @@ import org.mockito.Mockito; import org.springframework.beans.factory.annotation.Autowired; import com.fasterxml.jackson.databind.ObjectMapper; -import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileProcessingClient; -import com.iqser.red.service.peristence.v1.server.integration.client.InternalDictionaryClient; -import com.iqser.red.service.peristence.v1.server.integration.client.ManualRedactionClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.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.server.integration.client.DictionaryClient; +import com.iqser.red.service.persistence.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.integration.client.FileProcessingClient; +import com.iqser.red.service.persistence.server.integration.client.InternalDictionaryClient; +import com.iqser.red.service.persistence.server.integration.client.ManualRedactionClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.FileTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.TypeProvider; +import com.iqser.red.service.persistence.server.integration.service.UserProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.management.v1.processor.service.DictionaryManagementService; import com.iqser.red.service.persistence.management.v1.processor.service.EntityLogService; import com.iqser.red.service.persistence.management.v1.processor.service.FileManagementStorageService; @@ -45,11 +45,7 @@ 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.EntityLogEntry; import com.iqser.red.service.persistence.service.v1.api.shared.model.analysislog.entitylog.EntryState; 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.annotations.AddRedactionRequest; -import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.ManualRedactions; import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.Rectangle; -import com.iqser.red.service.persistence.service.v1.api.shared.model.annotations.entitymapped.ManualRedactionEntry; -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.type.DictionaryEntryType; import com.iqser.red.service.persistence.service.v1.api.shared.model.manual.AddRedactionRequestModel; import com.iqser.red.service.persistence.service.v1.api.shared.model.manual.ForceRedactionRequestModel; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationPreferencesServiceTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/NotificationPreferencesServiceTest.java similarity index 86% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationPreferencesServiceTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/NotificationPreferencesServiceTest.java index 4d16624ce..e0074edf0 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationPreferencesServiceTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/NotificationPreferencesServiceTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -6,8 +6,8 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; -import com.iqser.red.service.peristence.v1.server.integration.utils.MultithreadedTestRunner; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.utils.MultithreadedTestRunner; import com.iqser.red.service.persistence.management.v1.processor.service.NotificationPreferencesService; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.NotificationPreferencesPersistenceService; import com.knecon.fforesight.tenantcommons.TenantContext; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationPreferencesTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/NotificationPreferencesTest.java similarity index 93% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationPreferencesTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/NotificationPreferencesTest.java index 791c2da89..f4273abcb 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationPreferencesTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/NotificationPreferencesTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -9,8 +9,8 @@ import org.junit.jupiter.api.Test; import org.junit.jupiter.api.BeforeEach; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.NotificationPreferencesClient; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.client.NotificationPreferencesClient; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.service.v1.api.shared.model.notification.EmailNotificationType; import com.iqser.red.service.persistence.service.v1.api.shared.model.notification.NotificationPreferences; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/NotificationTest.java similarity index 92% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/NotificationTest.java index 2619802ae..232778b36 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/NotificationTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/NotificationTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -9,11 +9,11 @@ import org.assertj.core.util.Lists; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.NotificationClient; -import com.iqser.red.service.peristence.v1.server.integration.client.NotificationPreferencesClient; -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.peristence.v1.server.integration.utils.MultithreadedTestRunner; +import com.iqser.red.service.persistence.server.integration.client.NotificationClient; +import com.iqser.red.service.persistence.server.integration.client.NotificationPreferencesClient; +import com.iqser.red.service.persistence.server.integration.service.UserProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.utils.MultithreadedTestRunner; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.NotificationPersistenceService; import com.iqser.red.service.persistence.service.v1.api.shared.model.audit.AddNotificationRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.common.JSONPrimitive; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReanalysisTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ReanalysisTest.java similarity index 87% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReanalysisTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ReanalysisTest.java index 19f547b96..f79625397 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReanalysisTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ReanalysisTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -8,11 +8,11 @@ import java.util.Set; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -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.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.integration.client.ReanalysisClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.FileTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; 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; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReduceFileSizeMigrationTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ReduceFileSizeMigrationTest.java similarity index 90% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReduceFileSizeMigrationTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ReduceFileSizeMigrationTest.java index c1241731f..f07b146a9 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReduceFileSizeMigrationTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ReduceFileSizeMigrationTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import java.io.FileOutputStream; @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.core.io.ClassPathResource; import com.fasterxml.jackson.databind.ObjectMapper; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.management.v1.processor.migration.migrations.ReduceTextFileSizeMigration10; import com.iqser.red.service.persistence.management.v1.processor.utils.FileUtils; import com.iqser.red.service.persistence.management.v1.processor.utils.StorageIdUtils; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReportTemplateTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ReportTemplateTest.java similarity index 96% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReportTemplateTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ReportTemplateTest.java index dcb05aff3..043c7179e 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ReportTemplateTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ReportTemplateTest.java @@ -1,14 +1,14 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.ReportTemplateClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.server.integration.client.ReportTemplateClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.ReportTemplateProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.service.v1.api.shared.model.ReportTemplateUpdateRequest; import feign.FeignException; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RulesTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/RulesTest.java similarity index 95% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RulesTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/RulesTest.java index 6ac61f6b0..d9f8d34c3 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/RulesTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/RulesTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.Mockito.when; @@ -13,10 +13,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; -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.DossierTemplateTesterAndProvider; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.client.RulesClient; +import com.iqser.red.service.persistence.server.integration.client.VersionClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.service.v1.api.shared.model.RuleFileType; 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.RulesUploadRequestModel; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/StringCleaningUtilityTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/StringCleaningUtilityTest.java similarity index 95% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/StringCleaningUtilityTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/StringCleaningUtilityTest.java index 4620fe162..320175b68 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/StringCleaningUtilityTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/StringCleaningUtilityTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.junit.jupiter.api.Assertions.assertEquals; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/TypeTest.java similarity index 88% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/TypeTest.java index a82d6d735..666a2f328 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/TypeTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/TypeTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -7,15 +7,14 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.server.integration.client.DictionaryClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.TypeProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.service.v1.api.shared.model.UpdateTypeValue; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.configuration.Colors; 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.Type; public class TypeTest extends AbstractPersistenceServerServiceTest { diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ViewedPagesTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ViewedPagesTest.java similarity index 73% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ViewedPagesTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ViewedPagesTest.java index 1e7dc5242..b09b6b801 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/ViewedPagesTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/ViewedPagesTest.java @@ -1,19 +1,18 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; -import com.iqser.red.service.peristence.v1.server.integration.client.ViewedPagesClient; -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.service.UserProvider; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.integration.client.ViewedPagesClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.FileTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.UserProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; 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.common.JSONPrimitive; public class ViewedPagesTest extends AbstractPersistenceServerServiceTest { diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/WatermarkTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/WatermarkTest.java similarity index 95% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/WatermarkTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/WatermarkTest.java index 5c940ad8c..18abf92f6 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/WatermarkTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/WatermarkTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests; +package com.iqser.red.service.persistence.server.integration.tests; import static org.assertj.core.api.Assertions.assertThat; @@ -7,11 +7,11 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient; -import com.iqser.red.service.peristence.v1.server.integration.client.WatermarkClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.server.integration.client.DossierClient; +import com.iqser.red.service.persistence.server.integration.client.WatermarkClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.DossierTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.service.v1.api.shared.model.DossierRequest; import com.iqser.red.service.persistence.service.v1.api.shared.model.WatermarkModel; import com.iqser.red.service.persistence.service.v1.api.shared.model.common.JSONPrimitive; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/performance/EntityPerformanceTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/performance/EntityPerformanceTest.java similarity index 91% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/performance/EntityPerformanceTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/performance/EntityPerformanceTest.java index 64a146530..230a17e78 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/performance/EntityPerformanceTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/performance/EntityPerformanceTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests.performance; +package com.iqser.red.service.persistence.server.integration.tests.performance; import static org.assertj.core.api.Assertions.assertThat; @@ -9,11 +9,11 @@ import java.util.stream.Collectors; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.DictionaryClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierTemplateClient; -import com.iqser.red.service.peristence.v1.server.integration.service.DossierTemplateTesterAndProvider; -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.server.integration.client.DictionaryClient; +import com.iqser.red.service.persistence.server.integration.client.DossierTemplateClient; +import com.iqser.red.service.persistence.server.integration.service.DossierTemplateTesterAndProvider; +import com.iqser.red.service.persistence.server.integration.service.TypeProvider; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DictionaryEntryEntity; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.dictionaryentry.EntryRepository; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.CloneDossierTemplateRequest; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/performance/FilePerformanceTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/performance/FilePerformanceTest.java similarity index 83% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/performance/FilePerformanceTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/performance/FilePerformanceTest.java index 450ab69bb..065f49c5f 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/performance/FilePerformanceTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/performance/FilePerformanceTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests.performance; +package com.iqser.red.service.persistence.server.integration.tests.performance; import static org.assertj.core.api.Assertions.assertThat; @@ -8,10 +8,10 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierStatsClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; -import com.iqser.red.service.peristence.v1.server.integration.utils.AbstractPersistenceServerServiceTest; +import com.iqser.red.service.persistence.server.integration.client.DossierClient; +import com.iqser.red.service.persistence.server.integration.client.DossierStatsClient; +import com.iqser.red.service.persistence.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.integration.utils.AbstractPersistenceServerServiceTest; import com.iqser.red.service.persistence.service.v1.api.shared.model.dossiertemplate.dossier.Dossier; import com.knecon.fforesight.tenantcommons.TenantContext; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/performance/PerformanceTestService.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/performance/PerformanceTestService.java similarity index 96% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/performance/PerformanceTestService.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/performance/PerformanceTestService.java index 38635fe6d..830607471 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/tests/performance/PerformanceTestService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/tests/performance/PerformanceTestService.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.tests.performance; +package com.iqser.red.service.persistence.server.integration.tests.performance; import java.time.OffsetDateTime; import java.util.ArrayList; @@ -16,10 +16,10 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.context.TransientSecurityContext; import org.springframework.stereotype.Service; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierClient; -import com.iqser.red.service.peristence.v1.server.integration.client.DossierStatsClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; -import com.iqser.red.service.peristence.v1.server.integration.service.UserProvider; +import com.iqser.red.service.persistence.server.integration.client.DossierClient; +import com.iqser.red.service.persistence.server.integration.client.DossierStatsClient; +import com.iqser.red.service.persistence.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.integration.service.UserProvider; import com.iqser.red.service.persistence.management.v1.processor.acl.custom.dossier.DossierACLService; import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.DictionaryEntryEntity; import com.iqser.red.service.persistence.management.v1.processor.entity.configuration.TypeEntity; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/AbstractPersistenceServerServiceTest.java similarity index 98% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/AbstractPersistenceServerServiceTest.java index 6a2c43035..697a59ce8 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/AbstractPersistenceServerServiceTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/AbstractPersistenceServerServiceTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.utils; +package com.iqser.red.service.persistence.server.integration.utils; import static org.mockito.Mockito.when; @@ -49,10 +49,10 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit.jupiter.SpringExtension; import com.iqser.red.commons.jackson.ObjectMapperFactory; -import com.iqser.red.service.peristence.v1.server.Application; -import com.iqser.red.service.peristence.v1.server.integration.client.ApplicationConfigClient; -import com.iqser.red.service.peristence.v1.server.integration.client.FileClient; -import com.iqser.red.service.peristence.v1.server.utils.MetricsPrinterService; +import com.iqser.red.service.persistence.server.integration.client.ApplicationConfigClient; +import com.iqser.red.service.persistence.server.integration.client.FileClient; +import com.iqser.red.service.persistence.server.Application; +import com.iqser.red.service.persistence.server.utils.MetricsPrinterService; import com.iqser.red.service.persistence.management.v1.processor.client.pdftronredactionservice.PDFTronClient; import com.iqser.red.service.persistence.management.v1.processor.client.redactionservice.RedactionClient; import com.iqser.red.service.persistence.management.v1.processor.client.searchservice.SearchClient; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/FeignRequestInterceptor.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/FeignRequestInterceptor.java similarity index 90% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/FeignRequestInterceptor.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/FeignRequestInterceptor.java index 2a1c258d5..e6ff73a8f 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/FeignRequestInterceptor.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/FeignRequestInterceptor.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.utils; +package com.iqser.red.service.persistence.server.integration.utils; import org.springframework.stereotype.Component; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/KneconRedisTestContainer.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/KneconRedisTestContainer.java similarity index 90% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/KneconRedisTestContainer.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/KneconRedisTestContainer.java index fcede2ceb..232d3e473 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/KneconRedisTestContainer.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/KneconRedisTestContainer.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.utils; +package com.iqser.red.service.persistence.server.integration.utils; import org.testcontainers.containers.GenericContainer; import org.testcontainers.utility.DockerImageName; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/KneconSpringPostgreSQLTestContainer.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/KneconSpringPostgreSQLTestContainer.java similarity index 97% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/KneconSpringPostgreSQLTestContainer.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/KneconSpringPostgreSQLTestContainer.java index 6981e94fa..bb93cdd9a 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/KneconSpringPostgreSQLTestContainer.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/KneconSpringPostgreSQLTestContainer.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.utils; +package com.iqser.red.service.persistence.server.integration.utils; import java.time.Duration; import java.time.temporal.ChronoUnit; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/MetricValidationUtils.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/MetricValidationUtils.java similarity index 94% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/MetricValidationUtils.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/MetricValidationUtils.java index 7681c34c5..33e09372d 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/MetricValidationUtils.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/MetricValidationUtils.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.utils; +package com.iqser.red.service.persistence.server.integration.utils; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/MongoDBTestContainer.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/MongoDBTestContainer.java similarity index 93% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/MongoDBTestContainer.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/MongoDBTestContainer.java index 6db3c46ec..5654ca02b 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/MongoDBTestContainer.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/MongoDBTestContainer.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.utils; +package com.iqser.red.service.persistence.server.integration.utils; import org.testcontainers.containers.GenericContainer; import org.testcontainers.utility.DockerImageName; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/MultithreadedTestRunner.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/MultithreadedTestRunner.java similarity index 96% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/MultithreadedTestRunner.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/MultithreadedTestRunner.java index 2dd4cc6c8..efe2d6796 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/MultithreadedTestRunner.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/MultithreadedTestRunner.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.utils; +package com.iqser.red.service.persistence.server.integration.utils; import java.util.ArrayList; import java.util.Collections; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/RedisTestContainer.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/RedisTestContainer.java similarity index 89% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/RedisTestContainer.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/RedisTestContainer.java index a756c4f5b..ba4032b51 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/RedisTestContainer.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/RedisTestContainer.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.utils; +package com.iqser.red.service.persistence.server.integration.utils; import org.testcontainers.containers.GenericContainer; import org.testcontainers.utility.DockerImageName; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/SpringPostgreSQLTestContainer.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/SpringPostgreSQLTestContainer.java similarity index 89% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/SpringPostgreSQLTestContainer.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/SpringPostgreSQLTestContainer.java index 56adc5e8e..3fb788bb0 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/SpringPostgreSQLTestContainer.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/SpringPostgreSQLTestContainer.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.utils; +package com.iqser.red.service.persistence.server.integration.utils; import org.testcontainers.containers.PostgreSQLContainer; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/TokenService.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/TokenService.java similarity index 86% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/TokenService.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/TokenService.java index fb6269a5b..7ec1bb48f 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/integration/utils/TokenService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/integration/utils/TokenService.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.integration.utils; +package com.iqser.red.service.persistence.server.integration.utils; import org.apache.commons.codec.binary.Base64; import org.springframework.stereotype.Service; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/utils/FileSystemBackArchiverTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/utils/FileSystemBackArchiverTest.java similarity index 97% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/utils/FileSystemBackArchiverTest.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/utils/FileSystemBackArchiverTest.java index 3aef8fe5c..92ab33c26 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/utils/FileSystemBackArchiverTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/utils/FileSystemBackArchiverTest.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.utils; +package com.iqser.red.service.persistence.server.utils; import static org.assertj.core.api.Assertions.assertThat; diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/utils/MetricsPrinterService.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/utils/MetricsPrinterService.java similarity index 98% rename from persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/utils/MetricsPrinterService.java rename to persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/utils/MetricsPrinterService.java index d32ff0324..bb3c4b946 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/peristence/v1/server/utils/MetricsPrinterService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/persistence/server/utils/MetricsPrinterService.java @@ -1,4 +1,4 @@ -package com.iqser.red.service.peristence.v1.server.utils; +package com.iqser.red.service.persistence.server.utils; import java.text.DecimalFormat; import java.util.ArrayList;