Merge branch 'feature/eds' into develop

Author: Vincenzo Ingenito

src/main/java/it/finanze/sanita/fse2/ms/edsclient/client/impl/BrokerClient.java

@@ -12,12 +12,12 @@
 package it.finanze.sanita.fse2.ms.edsclient.client.impl;
 
 import java.net.URI;
+import java.net.http.HttpHeaders;
 import java.util.Date;
 
 import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpEntity;
-import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 import org.springframework.web.util.UriComponentsBuilder;
@@ -38,7 +38,7 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
-@Component("uarClient")
+@Component
 public class BrokerClient implements IBrokerClient {
 
     private static final String MSG_UNSUPPORTED = "Unsupported exception";
@@ -61,7 +61,7 @@ public EdsResponseDTO dispatchAndSendData(BrokerRequestDTO brokerRequestDTO) {
         final String errorLog = "Errore riscontrato durante l'invio delle informazioni al broker";
 
         URI url = UriComponentsBuilder
-                .fromUriString(brokerCfg.getBrokerHost() + "/v1/eds/document"
+                .fromUriString(brokerCfg.getBrokerHost() + "/v1/ingestion/document"
                         + buildRequestPath(brokerRequestDTO.getOperation(),
                                 brokerRequestDTO.getIdentifier(), brokerRequestDTO.getWorkflowInstanceId(),
                                 brokerRequestDTO.getFiscalCode()))

src/main/java/it/finanze/sanita/fse2/ms/edsclient/controller/impl/EDSPublicationCTL.java

@@ -41,8 +41,7 @@ public EdsResponseDTO publish(final PublicationRequestBodyDTO requestBody, HttpS
         log.info("[START] {}() with arguments {}={}, {}={}", "publication", "traceId", traceInfoDTO.getTraceID(), "wif",
                 requestBody.getWorkflowInstanceId());
 
-        EdsResponseDTO out = edsInvocationSRV.publish(requestBody.getIdentificativoDoc(),
-                        requestBody.getWorkflowInstanceId());
+        EdsResponseDTO out = edsInvocationSRV.publish(requestBody.getIdentificativoDoc(), requestBody.getWorkflowInstanceId());
 
         log.info("[EXIT] {}() with arguments {}={}, {}={}", "publication", "traceId", traceInfoDTO.getTraceID(), "wif",
                 requestBody.getWorkflowInstanceId());
@@ -57,8 +56,7 @@ public EdsResponseDTO replace(final String idDoc, final DocumentRequestDTO repla
         log.info("[START] {}() with arguments {}={}, {}={}, {}={}", "replace", "traceId", traceInfoDTO.getTraceID(),
                 "wif", replaceInfo.getWorkflowInstanceId(), "idDoc", replaceInfo.getIdDoc());
 
-        EdsResponseDTO out = edsInvocationSRV.replace(replaceInfo.getIdDoc(),
-                        replaceInfo.getWorkflowInstanceId());
+        EdsResponseDTO out = edsInvocationSRV.replace(replaceInfo.getIdDoc(), replaceInfo.getWorkflowInstanceId());
 
         log.info("[EXIT] {}() with arguments {}={}, {}={}, {}={}", "replace", "traceId", traceInfoDTO.getTraceID(),
                 "wif", replaceInfo.getWorkflowInstanceId(), "idDoc", replaceInfo.getIdDoc());

src/main/java/it/finanze/sanita/fse2/ms/edsclient/service/IEdsInvocationSRV.java

@@ -22,6 +22,5 @@ public interface IEdsInvocationSRV {
 
     EdsResponseDTO delete(String identifier, String fiscalCode);
 
-    EdsResponseDTO update(String idDoc, EdsMetadataUpdateReqDTO updateReqDTO,
-            String fiscalCode);
+    EdsResponseDTO update(String idDoc, EdsMetadataUpdateReqDTO updateReqDTO, String fiscalCode);
 }