From 14855751851bf74060eb28734fc43d5078fc77c0 Mon Sep 17 00:00:00 2001 From: "Hanelore.Ianoseck" Date: Wed, 8 Nov 2023 17:50:20 +0200 Subject: [PATCH] Fixed PMD & styling issues --- .../external/api/impl/controller/DictionaryController.java | 2 +- .../api/impl/controller/DossierTemplateController.java | 2 -- .../external/api/impl/controller/DownloadController.java | 6 +++--- .../v1/external/api/impl/controller/RSSController.java | 3 --- .../service/persistence/NotificationEmailService.java | 7 +++---- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DictionaryController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DictionaryController.java index b158074d9..527e51c81 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DictionaryController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DictionaryController.java @@ -36,7 +36,7 @@ import static com.knecon.fforesight.auditor.model.Detail.d; - @Slf4j +@Slf4j @RestController @RequiredArgsConstructor public class DictionaryController implements DictionaryResource { diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java index 7edaedbd1..40304cb67 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DossierTemplateController.java @@ -143,8 +143,6 @@ public class DossierTemplateController implements DossierTemplateResource { @RequestBody CloneDossierTemplateRequest cloneDossierTemplateRequest, Auditor auditor) { - String userId = KeycloakSecurity.getUserId(); - try { DossierTemplateModel response = convert(dossierTemplateManagementService.cloneDossierTemplate(dossierTemplateId, cloneDossierTemplateRequest)); diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java index 5821659fe..32db80957 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/DownloadController.java @@ -195,7 +195,7 @@ public class DownloadController implements DownloadResource { TenantContext.setTenantId(tenantId); var downloadStatus = getDownloadStatus(storageId, userId); - var fileDownloadStream = getFileForDownload(storageId, userId, auditor); + var fileDownloadStream = getFileForDownload(storageId, auditor); return getResponseEntity(inline, fileDownloadStream, downloadStatus.getFilename(), MediaType.parseMediaType("application/zip"), downloadStatus.getFileSize()); }); @@ -211,7 +211,7 @@ public class DownloadController implements DownloadResource { } - private InputStreamResource getFileForDownload(String storageId, String userId, Auditor auditor) { + private InputStreamResource getFileForDownload(String storageId, Auditor auditor) { try { var response = storageService.getObject(TenantContext.getTenantId(), storageId); @@ -259,7 +259,7 @@ public class DownloadController implements DownloadResource { log.debug("downloadFileUsingOTT {}", oneTimeToken); var token = oneTimeTokenDownloadService.getToken(oneTimeToken); var downloadStatus = getDownloadStatus(token.getStorageId(), token.getUserId()); - var fileDownloadStream = getFileForDownload(token.getStorageId(), token.getUserId(), auditor); + var fileDownloadStream = getFileForDownload(token.getStorageId(), auditor); TenantContext.clear(); diff --git a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RSSController.java b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RSSController.java index d2c9356ce..d64d6020c 100644 --- a/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RSSController.java +++ b/persistence-service-v1/persistence-service-external-api-impl-v1/src/main/java/com/iqser/red/persistence/service/v1/external/api/impl/controller/RSSController.java @@ -64,9 +64,6 @@ public class RSSController implements RSSResource { @PreAuthorize("hasAuthority('" + GET_RSS + "')") public void addOverrides(@PathVariable(DOSSIER_ID) String dossierId, @PathVariable(FILE_ID) String fileId, @RequestBody ComponentsOverrides componentsOverrides, Auditor auditor) { - var rssReport = rssReportClient.getDetailedRSS(dossierId, fileId); - var components = rssReport.getFiles().get(0).getResult(); - componentOverrideService.addOverrides(dossierId, fileId, componentsOverrides); componentsOverrides.getComponentOverrides() diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationEmailService.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationEmailService.java index c6d178f24..503265f9a 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationEmailService.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/persistence/NotificationEmailService.java @@ -13,7 +13,6 @@ import lombok.extern.slf4j.Slf4j; @Slf4j @Service @RequiredArgsConstructor -@SuppressWarnings("PMD") public class NotificationEmailService { public void sendNotificationEmail(String userId, EmailNotificationType emailNotificationType, List notifications) { @@ -32,21 +31,21 @@ public class NotificationEmailService { private void sendDailyEmail(String userId, List notifications) { - log.info("Should send daily notification email for {}", userId); + log.info("Should send daily notification emails {} for {}", notifications, userId); // TODO } private void sendDailySummaryEmail(String userId, List notifications) { - log.info("Should send daily notification summary email for {}", userId); + log.info("Should send daily notification summary email {} for {}", notifications, userId); // TODO } private void sendWeeklySummaryEmail(String userId, List notifications) { - log.info("Should send weekly notification summary email for {}", userId); + log.info("Should send weekly notification summary email {} for {}", notifications, userId); // TODO }