Marmelator/persistence-service
1
0
Fork 0
Code Issues Pull Requests 17 Actions Packages Projects Releases 1.1k Wiki Activity

pmd fix

Browse Source
This commit is contained in:
Timo Bejan 2021-09-15 13:41:32 +03:00
parent a9288c4610
commit d17f85ab32
5 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/DigitalSignatureService.java
View File

@ -50,12 +50,12 @@ public class DigitalSignatureService {
public void updateDigitalSignature(DigitalSignature digitalSignatureModel) { public void updateDigitalSignature(DigitalSignature digitalSignatureModel) {
digitalSignatureRepository.findById(DigitalSignature.ID).ifPresentOrElse((digitalSignature -> { digitalSignatureRepository.findById(DigitalSignature.ID).ifPresentOrElse(digitalSignature -> {
digitalSignature.setCertificateName(digitalSignatureModel.getCertificateName()); digitalSignature.setCertificateName(digitalSignatureModel.getCertificateName());
digitalSignature.setLocation(digitalSignatureModel.getLocation()); digitalSignature.setLocation(digitalSignatureModel.getLocation());
digitalSignature.setContactInfo(digitalSignatureModel.getContactInfo()); digitalSignature.setContactInfo(digitalSignatureModel.getContactInfo());
digitalSignature.setReason(digitalSignatureModel.getReason()); digitalSignature.setReason(digitalSignatureModel.getReason());
}), () -> { }, () -> {
throw new NotFoundException("Digital Signature Not found"); throw new NotFoundException("Digital Signature Not found");
}); });
} }

4
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileService.java
View File

@ -49,7 +49,7 @@ public class FileService {
var dossier = dossierPersistenceService.getAndValidateDossier(request.getDossierId()); var dossier = dossierPersistenceService.getAndValidateDossier(request.getDossierId());
var fileId = generateFileId(request); var fileId = generateFileId(request);
var existingStatus = retrieveStatus(dossier.getId(), fileId); var existingStatus = retrieveStatus(fileId);
if (existingStatus != null) { if (existingStatus != null) {
if (existingStatus.getStatus().name().equals(Status.APPROVED.name())) { if (existingStatus.getStatus().name().equals(Status.APPROVED.name())) {
@ -87,7 +87,7 @@ public class FileService {
} }
private File retrieveStatus(String dossierId, String fileId) { private File retrieveStatus(String fileId) {
try { try {
return fileStatusService.getStatus(fileId); return fileStatusService.getStatus(fileId);

3
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/FileStatusService.java
View File

@ -15,7 +15,6 @@ import com.iqser.red.service.redaction.v1.model.AnalyzeResult;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.hibernate.Hibernate;
import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.amqp.rabbit.core.RabbitTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -212,7 +211,7 @@ public class FileStatusService {
return; return;
} }
var fileAttributes = fileStatus.getFileAttributes(); // var fileAttributes = fileStatus.getFileAttributes();
setStatusProcessing(fileId); setStatusProcessing(fileId);

8
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/ManualRedactionService.java
View File

@ -43,7 +43,7 @@ public class ManualRedactionService {
public ManualAddResponse addAddRedaction(String dossierId, String fileId, AddRedactionRequest addRedactionRequest) { public ManualAddResponse addAddRedaction(String dossierId, String fileId, AddRedactionRequest addRedactionRequest) {
var dossier = dossierPersistenceService.getAndValidateDossier(dossierId); dossierPersistenceService.getAndValidateDossier(dossierId);
if (addRedactionRequest.isAddToDictionary()) { if (addRedactionRequest.isAddToDictionary()) {
try { try {
@ -82,7 +82,7 @@ public class ManualRedactionService {
public ManualAddResponse addRemoveRedaction(String dossierId, String fileId, public ManualAddResponse addRemoveRedaction(String dossierId, String fileId,
RemoveRedactionRequest removeRedactionRequest) { RemoveRedactionRequest removeRedactionRequest) {
var dossier = dossierPersistenceService.getAndValidateDossier(dossierId); dossierPersistenceService.getAndValidateDossier(dossierId);
OffsetDateTime now = OffsetDateTime.now(); OffsetDateTime now = OffsetDateTime.now();
removeRedactionPersistenceService.insert(fileId, removeRedactionRequest); removeRedactionPersistenceService.insert(fileId, removeRedactionRequest);
@ -261,8 +261,10 @@ public class ManualRedactionService {
public void deleteRemoveRedaction(String dossierId, String fileId, String annotationId) { public void deleteRemoveRedaction(String dossierId, String fileId, String annotationId) {
dossierPersistenceService.getAndValidateDossier(dossierId);
var removeRedaction = getRemoveRedaction(fileId, annotationId); var removeRedaction = getRemoveRedaction(fileId, annotationId);
var dossier = dossierPersistenceService.getAndValidateDossier(dossierId);
handleRemoveFromDictionary(dossierId, fileId, annotationId, removeRedaction.getStatus(), handleRemoveFromDictionary(dossierId, fileId, annotationId, removeRedaction.getStatus(),
removeRedaction.isRemoveFromDictionary(), true); removeRedaction.isRemoveFromDictionary(), true);
removeRedactionPersistenceService.softDelete(fileId, annotationId, OffsetDateTime.now()); removeRedactionPersistenceService.softDelete(fileId, annotationId, OffsetDateTime.now());

5
persistence-service-v1/persistence-service-server-v1/src/main/java/com/iqser/red/service/file/management/v1/server/service/download/DownloadPreparationService.java
View File

@ -48,7 +48,7 @@ public class DownloadPreparationService {
try (FileSystemBackedArchiver fileSystemBackedArchiver = new FileSystemBackedArchiver()) { try (FileSystemBackedArchiver fileSystemBackedArchiver = new FileSystemBackedArchiver()) {
generateAndAddFiles(downloadStatus, fileSystemBackedArchiver, dossier.isWatermarkEnabled()); generateAndAddFiles(downloadStatus, fileSystemBackedArchiver, dossier.isWatermarkEnabled());
addReports(reportResultMessage, downloadStatus, fileSystemBackedArchiver, dossier.getDossierTemplateId()); addReports(reportResultMessage, fileSystemBackedArchiver);
storeZipFile(downloadStatus, fileSystemBackedArchiver); storeZipFile(downloadStatus, fileSystemBackedArchiver);
downloadStatusPersistenceService.updateStatus(downloadStatus.getStorageId(), DownloadStatus.DownloadStatusValue.READY, fileSystemBackedArchiver downloadStatusPersistenceService.updateStatus(downloadStatus.getStorageId(), DownloadStatus.DownloadStatusValue.READY, fileSystemBackedArchiver
@ -99,8 +99,7 @@ public class DownloadPreparationService {
} }
private void addReports(ReportResultMessage reportResultMessage, DownloadStatus downloadStatus, private void addReports(ReportResultMessage reportResultMessage, FileSystemBackedArchiver fileSystemBackedArchiver) {
FileSystemBackedArchiver fileSystemBackedArchiver, String dossierTemplateId) {
long addReportsStart = System.currentTimeMillis(); long addReportsStart = System.currentTimeMillis();
for (StoredFileInformation storedFileInformation : reportResultMessage.getStoredFileInformation()) { for (StoredFileInformation storedFileInformation : reportResultMessage.getStoredFileInformation()) {