From 660c5776a16f368a376c2d28e579da9fe52df694 Mon Sep 17 00:00:00 2001
From: Timo Bejan <timo.bejan.ext@iqser.com>
Date: Tue, 28 Sep 2021 16:13:52 +0300
Subject: [PATCH] upgraded ps integration

---
 .../persistence-service-processor-v1/pom.xml                | 6 ++++++
 .../v1/processor/service/DigitalSignatureService.java       | 3 ++-
 .../management/v1/processor}/utils/MagicConverter.java      | 2 +-
 .../persistence-service-server-v1/pom.xml                   | 5 -----
 .../peristence/v1/server/controller/AuditController.java    | 2 +-
 .../v1/server/controller/DictionaryController.java          | 2 +-
 .../v1/server/controller/DigitalSignatureController.java    | 2 +-
 .../controller/DossierAttributesConfigController.java       | 2 +-
 .../v1/server/controller/DossierAttributesController.java   | 2 +-
 .../peristence/v1/server/controller/DossierController.java  | 2 +-
 .../v1/server/controller/DossierTemplateController.java     | 2 +-
 .../peristence/v1/server/controller/DownloadController.java | 2 +-
 .../server/controller/FileAttributesConfigController.java   | 2 +-
 .../v1/server/controller/FileStatusController.java          | 2 +-
 .../v1/server/controller/LegalBasisMappingController.java   | 2 +-
 .../v1/server/controller/ManualRedactionController.java     | 2 +-
 .../v1/server/controller/NotificationController.java        | 2 +-
 .../v1/server/controller/ReportTemplateController.java      | 2 +-
 .../v1/server/controller/SMTPConfigurationController.java   | 2 +-
 .../v1/server/controller/ViewedPagesController.java         | 2 +-
 .../v1/server/controller/WatermarkController.java           | 2 +-
 .../v1/server/service/ManualRedactionProviderService.java   | 2 +-
 22 files changed, 27 insertions(+), 25 deletions(-)
 rename persistence-service-v1/{persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server => persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor}/utils/MagicConverter.java (97%)

diff --git a/persistence-service-v1/persistence-service-processor-v1/pom.xml b/persistence-service-v1/persistence-service-processor-v1/pom.xml
index b795b2a17..3347fd5a6 100644
--- a/persistence-service-v1/persistence-service-processor-v1/pom.xml
+++ b/persistence-service-v1/persistence-service-processor-v1/pom.xml
@@ -95,6 +95,12 @@
             <artifactId>log4j-slf4j-impl</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>29.0-jre</version>
+            <scope>compile</scope>
+        </dependency>
 
     </dependencies>
 </project>
diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java
index a6d697da1..0263da393 100644
--- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java
@@ -13,7 +13,8 @@ import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
 
-import static org.hibernate.query.criteria.internal.ValueHandlerFactory.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
+
 
 @Slf4j
 @Service
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/utils/MagicConverter.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/utils/MagicConverter.java
similarity index 97%
rename from persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/utils/MagicConverter.java
rename to persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/utils/MagicConverter.java
index 433aa2da7..640bf75a2 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/utils/MagicConverter.java
+++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/utils/MagicConverter.java
@@ -1,4 +1,4 @@
-package com.iqser.red.service.peristence.v1.server.utils;
+package com.iqser.red.service.persistence.management.v1.processor.utils;
 
 import com.google.common.collect.Lists;
 import com.iqser.red.service.persistence.service.v1.api.model.common.Page;
diff --git a/persistence-service-v1/persistence-service-server-v1/pom.xml b/persistence-service-v1/persistence-service-server-v1/pom.xml
index 92f1619ff..d74c61571 100644
--- a/persistence-service-v1/persistence-service-server-v1/pom.xml
+++ b/persistence-service-v1/persistence-service-server-v1/pom.xml
@@ -100,11 +100,6 @@
             <groupId>com.iqser.red.commons</groupId>
             <artifactId>metric-commons</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <version>29.0-jre</version>
-        </dependency>
         <dependency>
             <groupId>com.opencsv</groupId>
             <artifactId>opencsv</artifactId>
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/AuditController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/AuditController.java
index 1cf5e1268..ff10a7b1a 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/AuditController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/AuditController.java
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @RestController
 @RequiredArgsConstructor
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java
index 7f09ace8f..c3fdbd36b 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DictionaryController.java
@@ -29,7 +29,7 @@ import java.util.Optional;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 import static java.util.stream.Collectors.toList;
 
 @RestController
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DigitalSignatureController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DigitalSignatureController.java
index 3d70b1fe3..c6bb6d654 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DigitalSignatureController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DigitalSignatureController.java
@@ -8,7 +8,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @RestController
 @RequiredArgsConstructor
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierAttributesConfigController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierAttributesConfigController.java
index a8cb2b7c3..bf613783c 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierAttributesConfigController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierAttributesConfigController.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @Slf4j
 @RestController
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierAttributesController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierAttributesController.java
index dbed1ac4f..2c31faa81 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierAttributesController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierAttributesController.java
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @RestController
 @RequiredArgsConstructor
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierController.java
index 89a8123a0..f25a22dcf 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierController.java
@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 import static com.iqser.red.service.persistence.management.v1.processor.exception.DossierNotFoundException.DOSSIER_NOT_FOUND_MESSAGE;
 
 @RestController
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierTemplateController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierTemplateController.java
index 253a321ca..01c8e6aba 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierTemplateController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DossierTemplateController.java
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @Slf4j
 @RestController
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DownloadController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DownloadController.java
index 2fb92b5a2..084b9115e 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DownloadController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/DownloadController.java
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @RestController
 @RequiredArgsConstructor
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileAttributesConfigController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileAttributesConfigController.java
index a40373a86..c31f527e8 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileAttributesConfigController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileAttributesConfigController.java
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @Slf4j
 @RestController
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java
index d575106ca..c41da39e5 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/FileStatusController.java
@@ -19,7 +19,7 @@ import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @RestController
 @RequiredArgsConstructor
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/LegalBasisMappingController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/LegalBasisMappingController.java
index 9ef66ee7c..28b3abb3a 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/LegalBasisMappingController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/LegalBasisMappingController.java
@@ -14,7 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 import javax.transaction.Transactional;
 import java.util.List;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 
 @RestController
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ManualRedactionController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ManualRedactionController.java
index 2438b8df6..0a28f2851 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ManualRedactionController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ManualRedactionController.java
@@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @RestController
 @RequiredArgsConstructor
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/NotificationController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/NotificationController.java
index e12c45964..1d250ff74 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/NotificationController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/NotificationController.java
@@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.time.OffsetDateTime;
 import java.util.List;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @RestController
 @RequiredArgsConstructor
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReportTemplateController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReportTemplateController.java
index 661f2ecb1..026ba049b 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReportTemplateController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ReportTemplateController.java
@@ -21,7 +21,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.UUID;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @RestController
 @RequiredArgsConstructor
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/SMTPConfigurationController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/SMTPConfigurationController.java
index d73ec47ba..5201b6695 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/SMTPConfigurationController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/SMTPConfigurationController.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @Slf4j
 @RestController
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ViewedPagesController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ViewedPagesController.java
index cbd4a0f3c..26b093809 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ViewedPagesController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/ViewedPagesController.java
@@ -10,7 +10,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @RestController
 @RequiredArgsConstructor
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/WatermarkController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/WatermarkController.java
index 07becc4ed..63f62b606 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/WatermarkController.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/controller/WatermarkController.java
@@ -8,7 +8,7 @@ import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RestController;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @RestController
 @RequiredArgsConstructor
diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionProviderService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionProviderService.java
index 59872027a..4facc8599 100644
--- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionProviderService.java
+++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/peristence/v1/server/service/ManualRedactionProviderService.java
@@ -11,7 +11,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import static com.iqser.red.service.peristence.v1.server.utils.MagicConverter.convert;
+import static com.iqser.red.service.persistence.management.v1.processor.utils.MagicConverter.convert;
 
 @Service
 @RequiredArgsConstructor