[GRD-3891] organize monitor-server services

Author: khouadrired

monitor-server/src/main/java/org/gridsuite/monitor/server/controllers/MonitorController.java

@@ -16,7 +16,7 @@
 import org.gridsuite.monitor.commons.SecurityAnalysisConfig;
 import org.gridsuite.monitor.server.dto.ProcessExecution;
 import org.gridsuite.monitor.server.dto.ReportPage;
-import org.gridsuite.monitor.server.services.MonitorService;
+import org.gridsuite.monitor.server.services.internal.MonitorService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 

…ices/SecurityAnalysisResultProvider.java …pter/SecurityAnalysisResultProvider.javamonitor-server/src/main/java/org/gridsuite/monitor/server/services/SecurityAnalysisResultProvider.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/external/adapter/SecurityAnalysisResultProvider.java monitor-server/src/main/java/org/gridsuite/monitor/server/services/SecurityAnalysisResultProvider.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/external/adapter/SecurityAnalysisResultProvider.java

@@ -4,9 +4,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.monitor.server.services;
+package org.gridsuite.monitor.server.services.external.adapter;
 
 import org.gridsuite.monitor.commons.ResultType;
+import org.gridsuite.monitor.server.services.internal.ResultProvider;
+import org.gridsuite.monitor.server.services.external.client.SecurityAnalysisRestClient;
 import org.springframework.stereotype.Service;
 
 import java.util.UUID;
@@ -16,10 +18,10 @@
  */
 @Service
 public class SecurityAnalysisResultProvider implements ResultProvider {
-    private final SecurityAnalysisService securityAnalysisService;
+    private final SecurityAnalysisRestClient securityAnalysisRestClient;
 
-    public SecurityAnalysisResultProvider(SecurityAnalysisService securityAnalysisService) {
-        this.securityAnalysisService = securityAnalysisService;
+    public SecurityAnalysisResultProvider(SecurityAnalysisRestClient securityAnalysisRestClient) {
+        this.securityAnalysisRestClient = securityAnalysisRestClient;
     }
 
     @Override
@@ -29,11 +31,11 @@ public ResultType getType() {
 
     @Override
     public String getResult(UUID resultId) {
-        return securityAnalysisService.getResult(resultId);
+        return securityAnalysisRestClient.getResult(resultId);
     }
 
     @Override
     public void deleteResult(UUID resultId) {
-        securityAnalysisService.deleteResult(resultId);
+        securityAnalysisRestClient.deleteResult(resultId);
     }
 }

…nitor/server/services/ReportService.java …es/external/client/ReportRestClient.javamonitor-server/src/main/java/org/gridsuite/monitor/server/services/ReportService.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/external/client/ReportRestClient.java monitor-server/src/main/java/org/gridsuite/monitor/server/services/ReportService.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/external/client/ReportRestClient.java

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.monitor.server.services;
+package org.gridsuite.monitor.server.services.external.client;
 
 import org.gridsuite.monitor.server.dto.ReportPage;
 import org.springframework.beans.factory.annotation.Value;
@@ -24,7 +24,7 @@
  * @author Franck Lecuyer <franck.lecuyer at rte-france.com>
  */
 @Service
-public class ReportService {
+public class ReportRestClient {
     private static final String REPORT_API_VERSION = "v1";
 
     private static final String DELIMITER = "/";
@@ -33,8 +33,8 @@ public class ReportService {
 
     private final RestTemplate restTemplate;
 
-    public ReportService(@Value("${gridsuite.services.report-server.base-uri:http://report-server/}") String reportServerBaseUri,
-                         RestTemplateBuilder restTemplateBuilder) {
+    public ReportRestClient(@Value("${gridsuite.services.report-server.base-uri:http://report-server/}") String reportServerBaseUri,
+                            RestTemplateBuilder restTemplateBuilder) {
         this.reportServerBaseUri = reportServerBaseUri;
         this.restTemplate = restTemplateBuilder.build();
     }

…er/services/SecurityAnalysisService.java …l/client/SecurityAnalysisRestClient.javamonitor-server/src/main/java/org/gridsuite/monitor/server/services/SecurityAnalysisService.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/external/client/SecurityAnalysisRestClient.java monitor-server/src/main/java/org/gridsuite/monitor/server/services/SecurityAnalysisService.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/external/client/SecurityAnalysisRestClient.java

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.monitor.server.services;
+package org.gridsuite.monitor.server.services.external.client;
 
 import lombok.Setter;
 import org.slf4j.Logger;
@@ -23,8 +23,8 @@
  * @author Kevin Le Saulnier <kevin.le-saulnier at rte-france.com>
  */
 @Service
-public class SecurityAnalysisService {
-    private static final Logger LOGGER = LoggerFactory.getLogger(SecurityAnalysisService.class);
+public class SecurityAnalysisRestClient {
+    private static final Logger LOGGER = LoggerFactory.getLogger(SecurityAnalysisRestClient.class);
     static final String SA_API_VERSION = "v1";
     private static final String DELIMITER = "/";
 
@@ -37,7 +37,7 @@ private String getSecurityAnalysisServerBaseUri() {
         return this.securityAnalysisServerBaseUri + DELIMITER + SA_API_VERSION + DELIMITER;
     }
 
-    public SecurityAnalysisService(
+    public SecurityAnalysisRestClient(
         RestTemplateBuilder restTemplateBuilder,
         @Value("${gridsuite.services.security-analysis-server.base-uri:http://security-analysis-server/}") String securityAnalysisServerBaseUri) {
         this.securityAnalysisServerBaseUri = securityAnalysisServerBaseUri;

…itor/server/services/MonitorService.java …er/services/internal/MonitorService.javamonitor-server/src/main/java/org/gridsuite/monitor/server/services/MonitorService.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/internal/MonitorService.java monitor-server/src/main/java/org/gridsuite/monitor/server/services/MonitorService.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/internal/MonitorService.java

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.monitor.server.services;
+package org.gridsuite.monitor.server.services.internal;
 
 import org.gridsuite.monitor.commons.ProcessConfig;
 import org.gridsuite.monitor.commons.ProcessExecutionStep;
@@ -18,6 +18,8 @@
 import org.gridsuite.monitor.server.mapper.ProcessExecutionMapper;
 import org.gridsuite.monitor.server.mapper.ProcessExecutionStepMapper;
 import org.gridsuite.monitor.server.repositories.ProcessExecutionRepository;
+import org.gridsuite.monitor.server.services.messaging.NotificationService;
+import org.gridsuite.monitor.server.services.external.client.ReportRestClient;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -35,16 +37,16 @@ public class MonitorService {
 
     private final ProcessExecutionRepository executionRepository;
     private final NotificationService notificationService;
-    private final ReportService reportService;
+    private final ReportRestClient reportRestClient;
     private final ResultService resultService;
 
     public MonitorService(ProcessExecutionRepository executionRepository,
                           NotificationService notificationService,
-                          ReportService reportService,
+                          ReportRestClient reportRestClient,
                           ResultService resultService) {
         this.executionRepository = executionRepository;
         this.notificationService = notificationService;
-        this.reportService = reportService;
+        this.reportRestClient = reportRestClient;
         this.resultService = resultService;
     }
 
@@ -142,7 +144,7 @@ private ProcessExecutionStepEntity toStepEntity(ProcessExecutionStep processExec
     public List<ReportPage> getReports(UUID executionId) {
         List<UUID> reportIds = getReportIds(executionId);
         return reportIds.stream()
-                .map(reportService::getReport)
+                .map(reportRestClient::getReport)
                 .toList();
     }
 
@@ -206,7 +208,7 @@ public boolean deleteExecution(UUID executionId) {
                 }
             });
             resultIds.forEach(resultService::deleteResult);
-            reportIds.forEach(reportService::deleteReport);
+            reportIds.forEach(reportRestClient::deleteReport);
 
             executionRepository.deleteById(executionId);
 

…itor/server/services/ResultProvider.java …er/services/internal/ResultProvider.javamonitor-server/src/main/java/org/gridsuite/monitor/server/services/ResultProvider.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/internal/ResultProvider.java monitor-server/src/main/java/org/gridsuite/monitor/server/services/ResultProvider.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/internal/ResultProvider.java

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.monitor.server.services;
+package org.gridsuite.monitor.server.services.internal;
 
 import org.gridsuite.monitor.commons.ResultType;
 

…nitor/server/services/ResultService.java …ver/services/internal/ResultService.javamonitor-server/src/main/java/org/gridsuite/monitor/server/services/ResultService.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/internal/ResultService.java monitor-server/src/main/java/org/gridsuite/monitor/server/services/ResultService.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/internal/ResultService.java

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.monitor.server.services;
+package org.gridsuite.monitor.server.services.internal;
 
 import org.gridsuite.monitor.commons.ResultInfos;
 import org.gridsuite.monitor.commons.ResultType;

…tor/server/services/ConsumerService.java …/services/messaging/ConsumerService.javamonitor-server/src/main/java/org/gridsuite/monitor/server/services/ConsumerService.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/messaging/ConsumerService.java monitor-server/src/main/java/org/gridsuite/monitor/server/services/ConsumerService.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/messaging/ConsumerService.java

@@ -4,14 +4,15 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.monitor.server.services;
+package org.gridsuite.monitor.server.services.messaging;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.gridsuite.monitor.commons.MessageType;
 import org.gridsuite.monitor.commons.ProcessExecutionStatusUpdate;
 import org.gridsuite.monitor.commons.ProcessExecutionStep;
+import org.gridsuite.monitor.server.services.internal.MonitorService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

…server/services/NotificationService.java …vices/messaging/NotificationService.javamonitor-server/src/main/java/org/gridsuite/monitor/server/services/NotificationService.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/messaging/NotificationService.java monitor-server/src/main/java/org/gridsuite/monitor/server/services/NotificationService.java renamed to monitor-server/src/main/java/org/gridsuite/monitor/server/services/messaging/NotificationService.java

@@ -4,7 +4,7 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
-package org.gridsuite.monitor.server.services;
+package org.gridsuite.monitor.server.services.messaging;
 
 import lombok.RequiredArgsConstructor;
 import org.gridsuite.monitor.commons.ProcessConfig;

monitor-server/src/test/java/org/gridsuite/monitor/server/MonitorIntegrationTest.java

@@ -14,11 +14,11 @@
 import org.gridsuite.monitor.server.entities.ProcessExecutionEntity;
 import org.gridsuite.monitor.server.repositories.ProcessConfigRepository;
 import org.gridsuite.monitor.server.repositories.ProcessExecutionRepository;
-import org.gridsuite.monitor.server.services.ConsumerService;
+import org.gridsuite.monitor.server.services.messaging.ConsumerService;
 import org.gridsuite.monitor.server.services.ProcessConfigService;
-import org.gridsuite.monitor.server.services.ReportService;
-import org.gridsuite.monitor.server.services.MonitorService;
-import org.gridsuite.monitor.server.services.ResultService;
+import org.gridsuite.monitor.server.services.external.client.ReportRestClient;
+import org.gridsuite.monitor.server.services.internal.MonitorService;
+import org.gridsuite.monitor.server.services.internal.ResultService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -78,7 +78,7 @@ class MonitorIntegrationTest {
     private MockMvc mockMvc;
 
     @MockitoBean
-    private ReportService reportService;
+    private ReportRestClient reportRestClient;
 
     @MockitoBean
     private ResultService resultService;
@@ -183,8 +183,8 @@ void securityAnalysisProcessIT() throws Exception {
             new ReportLog("message2", Severity.WARN, 2, UUID.randomUUID())), 100, 10);
         ReportPage reportPage1 = new ReportPage(2, List.of(new ReportLog("message3", Severity.ERROR, 3, UUID.randomUUID())), 200, 20);
 
-        when(reportService.getReport(reportId0)).thenReturn(reportPage0);
-        when(reportService.getReport(reportId1)).thenReturn(reportPage1);
+        when(reportRestClient.getReport(reportId0)).thenReturn(reportPage0);
+        when(reportRestClient.getReport(reportId1)).thenReturn(reportPage1);
 
         // Test the reports endpoint fetches correctly from database
         mockMvc.perform(get("/v1/executions/{executionId}/reports", executionId))