From 9edb1ebeeabc7bb1b73b5743c9c9d71f9c051a8d Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 14 Sep 2021 12:29:38 +0300 Subject: [PATCH] cleanup --- .../api/model/data/annotations/ViewedPage.java | 3 ++- .../data/configuration/SMTPConfiguration.java | 2 +- .../v1/api/model/data/configuration/Type.java | 4 ++-- .../v1/api/model/data/dossier/Dossier.java | 2 +- .../model/data/dossier/DossierAttribute.java | 6 ++++-- .../api/model/data/dossier/FileAttribute.java | 6 ++++-- ...ersistenceServiceProcessorConfiguration.java | 9 +++++++++ .../service/DigitalSignatureService.java | 8 ++++---- .../persistence/EntryPersistenceService.java | 2 +- .../repository/DossierTemplateRepository.java | 3 +++ .../persistence/repository/EntryRepository.java | 4 +++- .../persistence-service-server-v1/pom.xml | 5 +++++ .../server/client/PDFTronRedactionClient.java | 10 ---------- .../server/client/RedactionServiceClient.java | 8 -------- .../v1/server/controller/RulesController.java | 4 ++-- .../v1/server/controller/UploadController.java | 2 +- .../v1/server/service/FileService.java | 2 +- .../download/DownloadPreparationService.java | 2 +- .../src/main/resources/application-dev.yml | 17 ++++++++++++++++- ...AbstractFileManagementServerServiceTest.java | 11 +---------- 20 files changed, 61 insertions(+), 49 deletions(-) delete mode 100644 persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/client/PDFTronRedactionClient.java delete mode 100644 persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/client/RedactionServiceClient.java diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ViewedPage.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ViewedPage.java index 05028c67b..2246413af 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ViewedPage.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/annotations/ViewedPage.java @@ -20,6 +20,7 @@ public class ViewedPage { private OffsetDateTime viewedTime; @ManyToOne(fetch = FetchType.LAZY) + @MapsId("fileId") private File file; @Data @@ -28,7 +29,7 @@ public class ViewedPage { @AllArgsConstructor public static class ViewedPageId implements Serializable { - @Column + @Column(name = "file_id") private String fileId; @Column private int page; diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java index 169fb03d0..426441011 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/SMTPConfiguration.java @@ -17,7 +17,7 @@ public class SMTPConfiguration { @Id private final String id = SMTPConfiguration.ID; - @Column + @Column(name = "from_email") private String from; @Column private String fromDisplayName; diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Type.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Type.java index f2df42e62..feda39958 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Type.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/configuration/Type.java @@ -44,13 +44,13 @@ public class Type { @ManyToOne private DossierTemplate dossierTemplate; - @Column(updatable = false, insertable = false) + @Column(updatable = false, insertable = false, name = "dossier_template_id") private String dossierTemplateId; @ManyToOne private Dossier dossier; - @Column(updatable = false, insertable = false) + @Column(updatable = false, insertable = false, name = "dossier_id") private String dossierId; } diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/Dossier.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/Dossier.java index b9d457b28..43fb60b4e 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/Dossier.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/Dossier.java @@ -66,7 +66,7 @@ public class Dossier { @ManyToOne(fetch = FetchType.LAZY) private DossierTemplate dossierTemplate; - @Column(updatable=false, insertable=false) + @Column(updatable=false, insertable=false, name = "dossier_template_id") private String dossierTemplateId; @ManyToMany(fetch = FetchType.LAZY, mappedBy = "dossiers") diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierAttribute.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierAttribute.java index 0c113b4f5..e750c4115 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierAttribute.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/DossierAttribute.java @@ -20,9 +20,11 @@ public class DossierAttribute { private String value; @ManyToOne(fetch = FetchType.LAZY) + @MapsId("dossierId") private Dossier dossier; @ManyToOne(fetch = FetchType.LAZY) + @MapsId("dossierAttributeConfigId") private DossierAttributeConfig dossierAttributeConfig; @Data @@ -31,10 +33,10 @@ public class DossierAttribute { @Embeddable public static class DossierAttributeId implements Serializable { - @Column + @Column(name = "dossier_id") private String dossierId; - @Column + @Column(name = "dossier_attribute_config_id") private String dossierAttributeConfigId; } diff --git a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/FileAttribute.java b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/FileAttribute.java index 52289b173..8798e3e1d 100644 --- a/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/FileAttribute.java +++ b/persistence-service-v1/persistence-service-api-v1/src/main/java/com/iqser/red/service/persistence/service/v1/api/model/data/dossier/FileAttribute.java @@ -17,9 +17,11 @@ public class FileAttribute { private String value; @ManyToOne(fetch = FetchType.LAZY) + @MapsId("fileId") private File file; @ManyToOne(fetch = FetchType.LAZY) + @MapsId("fileAttributeConfigId") private FileAttributeConfig fileAttributeConfig; @@ -27,10 +29,10 @@ public class FileAttribute { @Embeddable public static class FileAttributeId implements Serializable { - @Column + @Column(name = "file_id") private String fileId; - @Column + @Column(name = "file_attribute_config_id") private String fileAttributeConfigId; } } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/PersistenceServiceProcessorConfiguration.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/PersistenceServiceProcessorConfiguration.java index c0c3c02c6..159548407 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/PersistenceServiceProcessorConfiguration.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/PersistenceServiceProcessorConfiguration.java @@ -1,12 +1,21 @@ package com.iqser.red.service.persistence.management.v1.processor; import com.iqser.red.service.persistence.management.v1.processor.client.PDFTronRedactionClient; +import com.iqser.red.service.persistence.management.v1.processor.service.persistence.repository.ColorsRepository; +import com.iqser.red.service.persistence.service.v1.api.model.data.annotations.Comment; +import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.Colors; +import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.Dossier; +import com.iqser.red.service.persistence.service.v1.api.model.data.download.DownloadStatus; +import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.cloud.openfeign.EnableFeignClients; import org.springframework.context.annotation.ComponentScan; import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; @Configuration @ComponentScan +@EntityScan(basePackageClasses = {Comment.class, Colors.class, Dossier.class, DownloadStatus.class}) +@EnableJpaRepositories(basePackageClasses = ColorsRepository.class) @EnableFeignClients(basePackageClasses = {PDFTronRedactionClient.class}) public class PersistenceServiceProcessorConfiguration { } 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 c398b9215..3f2eb7f0e 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 @@ -35,12 +35,12 @@ public class DigitalSignatureService { public DigitalSignature saveDigitalSignature(DigitalSignature digitalSignature) { - try { +// try { // TODO // pdfTronRedactionClient.testDigitalCurrentSignature(digitalSignature); - } catch (Exception e) { - throw new BadRequestException("Failed to test digital signature"); - } +// } catch (Exception e) { +// throw new BadRequestException("Failed to test digital signature"); +// } digitalSignature.setPrivateKey(encryptionDecryptionService.encrypt(digitalSignature.getPrivateKey())); digitalSignature.setPassword(encryptionDecryptionService.encrypt(digitalSignature.getPassword())); diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java index 5412a564e..2e52352e3 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/EntryPersistenceService.java @@ -42,7 +42,7 @@ public class EntryPersistenceService { public void setVersion(String typeId, List values, long version) { - entryRepository.updateVersionByTypeIdAndValueIn(version, typeId, values); + entryRepository.updateVersionWhereTypeIdAndValueIn(version, typeId, values); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierTemplateRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierTemplateRepository.java index e779737f5..d588b63ea 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierTemplateRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/DossierTemplateRepository.java @@ -2,9 +2,12 @@ package com.iqser.red.service.persistence.management.v1.processor.service.persis import com.iqser.red.service.persistence.service.v1.api.model.data.dossier.DossierTemplate; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import java.util.List; public interface DossierTemplateRepository extends JpaRepository { + + @Query("select d from DossierTemplate d where d.deleted = false or d.deleted is null") List findAllWhereDeletedIsFalse(); } diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/EntryRepository.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/EntryRepository.java index bbfc7550b..3b1162b78 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/EntryRepository.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/repository/EntryRepository.java @@ -2,6 +2,7 @@ package com.iqser.red.service.persistence.management.v1.processor.service.persis import com.iqser.red.service.persistence.service.v1.api.model.data.configuration.DictionaryEntry; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; import java.util.List; @@ -9,7 +10,8 @@ public interface EntryRepository extends JpaRepository { void deleteAllByTypeIdAndVersionAndValueIn(String typeId, long version, List values); - void updateVersionByTypeIdAndValueIn(long version, String typeId, List values); + @Query("update DictionaryEntry e set e.version = :version where e.type.id =:typeId and e.value in :values ") + void updateVersionWhereTypeIdAndValueIn(long version, String typeId, List values); List findByTypeId(String typeId); } diff --git a/persistence-service-v1/persistence-service-server-v1/pom.xml b/persistence-service-v1/persistence-service-server-v1/pom.xml index 2dad0c4b8..34247c057 100644 --- a/persistence-service-v1/persistence-service-server-v1/pom.xml +++ b/persistence-service-v1/persistence-service-server-v1/pom.xml @@ -87,6 +87,11 @@ com.iqser.red.commons spring-commons + + com.h2database + h2 + runtime + org.apache.commons commons-lang3 diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/client/PDFTronRedactionClient.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/client/PDFTronRedactionClient.java deleted file mode 100644 index 21f3a2f01..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/client/PDFTronRedactionClient.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.iqser.red.service.file.management.v1.server.client; - -import org.springframework.cloud.openfeign.FeignClient; - -import com.iqser.red.service.pdftron.redaction.v1.api.resources.PDFTronRedactionResource; - -@FeignClient(name = "PDFTronRedactionResource", url = "${pdftron-redaction-service.url}") -public interface PDFTronRedactionClient extends PDFTronRedactionResource { - -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/client/RedactionServiceClient.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/client/RedactionServiceClient.java deleted file mode 100644 index 64344481a..000000000 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/client/RedactionServiceClient.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.iqser.red.service.file.management.v1.server.client; - -import com.iqser.red.service.redaction.v1.resources.RedactionResource; -import org.springframework.cloud.openfeign.FeignClient; - -@FeignClient(name = "RedactionResource", url = "${redaction-service.url}") -public interface RedactionServiceClient extends RedactionResource { -} diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/controller/RulesController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/controller/RulesController.java index 62d9db3b6..93f10f1d6 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/controller/RulesController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/controller/RulesController.java @@ -1,6 +1,6 @@ package com.iqser.red.service.file.management.v1.server.controller; -import com.iqser.red.service.file.management.v1.server.client.RedactionServiceClient; +import com.iqser.red.service.file.management.v1.server.client.RedactionClient; import com.iqser.red.service.file.management.v1.server.exception.InvalidRulesException; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.RulesPersistenceService; import com.iqser.red.service.persistence.service.v1.api.model.JSONPrimitive; @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; public class RulesController implements RulesResource { private final RulesPersistenceService rulesPersistenceService; - private final RedactionServiceClient redactionServiceClient; + private final RedactionClient redactionServiceClient; @Override diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/controller/UploadController.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/controller/UploadController.java index 1bf268e98..324816bbc 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/controller/UploadController.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/controller/UploadController.java @@ -1,6 +1,5 @@ package com.iqser.red.service.file.management.v1.server.controller; -import com.iqser.red.service.file.management.v1.server.client.PDFTronRedactionClient; import com.iqser.red.service.file.management.v1.server.client.RedactionClient; import com.iqser.red.service.file.management.v1.server.service.DossierService; import com.iqser.red.service.file.management.v1.server.service.FileManagementStorageService; @@ -10,6 +9,7 @@ import com.iqser.red.service.pdftron.redaction.v1.api.model.PdfTronFlattenReques import com.iqser.red.service.pdftron.redaction.v1.api.model.PdfTronFlattenResponse; import com.iqser.red.service.pdftron.redaction.v1.api.model.PdfTronRedactionRequest; import com.iqser.red.service.pdftron.redaction.v1.api.model.PdfTronRedactionResult; +import com.iqser.red.service.persistence.management.v1.processor.client.PDFTronRedactionClient; import com.iqser.red.service.persistence.management.v1.processor.exception.DossierNotFoundException; import com.iqser.red.service.persistence.management.v1.processor.exception.FileNotFoundException; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService; diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileService.java index 11d961ddd..aaf7ce3ef 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileService.java @@ -2,9 +2,9 @@ package com.iqser.red.service.file.management.v1.server.service; import com.google.common.hash.HashFunction; import com.google.common.hash.Hashing; -import com.iqser.red.service.file.management.v1.server.client.PDFTronRedactionClient; import com.iqser.red.service.pdftron.redaction.v1.api.model.PdfTronOptimizeRequest; import com.iqser.red.service.pdftron.redaction.v1.api.model.PdfTronOptimizeResponse; +import com.iqser.red.service.persistence.management.v1.processor.client.PDFTronRedactionClient; import com.iqser.red.service.persistence.management.v1.processor.exception.ConflictException; import com.iqser.red.service.persistence.management.v1.processor.exception.FileNotFoundException; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.*; diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/download/DownloadPreparationService.java b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/download/DownloadPreparationService.java index 260c5e067..8b42a259c 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/download/DownloadPreparationService.java +++ b/persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/download/DownloadPreparationService.java @@ -1,11 +1,11 @@ package com.iqser.red.service.file.management.v1.server.service.download; -import com.iqser.red.service.file.management.v1.server.client.PDFTronRedactionClient; import com.iqser.red.service.file.management.v1.server.client.RedactionClient; import com.iqser.red.service.file.management.v1.server.service.FileManagementStorageService; import com.iqser.red.service.file.management.v1.server.service.RedactionLogService; import com.iqser.red.service.file.management.v1.server.utils.FileSystemBackedArchiver; import com.iqser.red.service.pdftron.redaction.v1.api.model.PdfTronRedactionRequest; +import com.iqser.red.service.persistence.management.v1.processor.client.PDFTronRedactionClient; import com.iqser.red.service.persistence.management.v1.processor.exception.FileNotFoundException; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DossierPersistenceService; import com.iqser.red.service.persistence.management.v1.processor.service.persistence.DownloadStatusPersistenceService; diff --git a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml index 3cd231395..74de30427 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml +++ b/persistence-service-v1/persistence-service-server-v1/src/main/resources/application-dev.yml @@ -16,4 +16,19 @@ storage: bucket-name: 'redaction' endpoint: 'http://localhost:9000' key: minioadmin - secret: minioadmin \ No newline at end of file + secret: minioadmin + +spring: + datasource: + jdbcUrl: jdbc:h2:mem:testdb + driverClassName: org.h2.Driver + username: sa + password: password + platform: org.hibernate.dialect.H2Dialect + jpa: + database-platform: org.hibernate.dialect.H2Dialect + hibernate: + ddl-auto: update + naming-strategy: org.hibernate.cfg.ImprovedNamingStrategy + generate-ddl: true + diff --git a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/file/management/v1/server/integration/AbstractFileManagementServerServiceTest.java b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/file/management/v1/server/integration/AbstractFileManagementServerServiceTest.java index f65678e23..ae65f644f 100644 --- a/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/file/management/v1/server/integration/AbstractFileManagementServerServiceTest.java +++ b/persistence-service-v1/persistence-service-server-v1/src/test/java/com/iqser/red/service/file/management/v1/server/integration/AbstractFileManagementServerServiceTest.java @@ -2,18 +2,9 @@ package com.iqser.red.service.file.management.v1.server.integration; import com.iqser.red.commons.persistence.cassandra.AbstractCassandraTest; import com.iqser.red.service.file.management.v1.server.Application; -import com.iqser.red.service.file.management.v1.server.client.PDFTronRedactionClient; -import com.iqser.red.storage.commons.StorageAutoConfiguration; -import com.iqser.red.storage.commons.service.StorageService; -import org.junit.After; import org.junit.runner.RunWith; -import org.springframework.amqp.rabbit.core.RabbitTemplate; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.EnableAutoConfiguration; -import org.springframework.boot.autoconfigure.amqp.RabbitAutoConfiguration; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.mock.mockito.MockBean; -import org.springframework.context.annotation.*; +import org.springframework.context.annotation.Import; import org.springframework.test.context.junit4.SpringRunner;