diff --git a/ems-core/src/main/java/it/integry/ems/schedule/new_cron_job/dto/operations/runners/CheckB2BScheduledOperationRunner.java b/ems-core/src/main/java/it/integry/ems/schedule/new_cron_job/dto/operations/runners/CheckB2BScheduledOperationRunner.java index a92055777a..ced1bf2e38 100644 --- a/ems-core/src/main/java/it/integry/ems/schedule/new_cron_job/dto/operations/runners/CheckB2BScheduledOperationRunner.java +++ b/ems-core/src/main/java/it/integry/ems/schedule/new_cron_job/dto/operations/runners/CheckB2BScheduledOperationRunner.java @@ -3,6 +3,7 @@ package it.integry.ems.schedule.new_cron_job.dto.operations.runners; import it.integry.ems.schedule.new_cron_job.dto.operations.CheckB2BAutomatedOperationDTO; import it.integry.ems.service.HttpRestWrapper; import it.integry.ems_model.config.EmsRestConstants; +import org.springframework.web.bind.annotation.RequestMethod; import org.springframework.web.context.ContextLoader; public class CheckB2BScheduledOperationRunner extends BaseScheduledOperationRunner { @@ -12,9 +13,10 @@ public class CheckB2BScheduledOperationRunner extends BaseScheduledOperationRunn public void run() throws Exception { final HttpRestWrapper httpRestWrapper = ContextLoader.getCurrentWebApplicationContext().getBean(HttpRestWrapper.class); - final Object internalGetResponse = httpRestWrapper.callInternalGet(getDtoInstance().getProfileDb(), + final Object internalGetResponse = httpRestWrapper.callInternalMethod(getDtoInstance().getProfileDb(), EmsRestConstants.PATH_READ_FPX_INBOX, - getDtoInstance().getUsername()); + getDtoInstance().getUsername(), + RequestMethod.POST); } diff --git a/ems-core/src/main/java/it/integry/ems/service/HttpRestWrapper.java b/ems-core/src/main/java/it/integry/ems/service/HttpRestWrapper.java index 2124c5e641..630a418624 100644 --- a/ems-core/src/main/java/it/integry/ems/service/HttpRestWrapper.java +++ b/ems-core/src/main/java/it/integry/ems/service/HttpRestWrapper.java @@ -57,24 +57,39 @@ public class HttpRestWrapper { } - - public Object callInternalGet(String profileDb, String service, String username) throws Exception { + public Object callInternalMethod(String profileDb, String service, String username, RequestMethod requestMethod) throws Exception { final String endPoint = String.format("http://localhost:%s/ems-api/", UtilityServer.getLocalServerPort()); final Client client = ClientBuilder.newClient(); final WebTarget resource = client.target(endPoint) .path(service); - Response response = resource + final Invocation.Builder requestBuilder = resource .queryParam(CommonConstants.PROFILE_DB, profileDb) .request() //.header("Authorization", "Basic " + auth) - .header("username", username) - .get(); + .header("username", username); + + Response response = null; + + switch (requestMethod) { + default: + case GET: + response = requestBuilder.get(); + break; + + case POST: + response = requestBuilder.post(null); + break; + + case PUT: + response = requestBuilder.put(null); + break; + } int status = response.getStatus(); - if(status != 200) + if (status != 200) throw new InternalRestCallException(status); String stringResponse = response.readEntity(String.class); diff --git a/ems-engine/src/main/java/it/integry/ems/document/controller/DocumentController.java b/ems-engine/src/main/java/it/integry/ems/document/controller/DocumentController.java index 044413fb0e..36c324e8ab 100644 --- a/ems-engine/src/main/java/it/integry/ems/document/controller/DocumentController.java +++ b/ems-engine/src/main/java/it/integry/ems/document/controller/DocumentController.java @@ -409,15 +409,9 @@ public class DocumentController { @RequestMapping(value = EmsRestConstants.PATH_READ_FPX_INBOX, method = RequestMethod.POST) public @ResponseBody - ServiceRestResponse readMail(@RequestParam(CommonConstants.PROFILE_DB) String configuration) { - ServiceRestResponse serviceRestResponse = ServiceRestResponse.createPositiveResponse(); - try { - digitalInvoiceMailService.readMailInbox(); - } catch (Exception ex) { - logger.error(ex.getMessage(), ex); - serviceRestResponse = ServiceRestResponse.createNegativeResponse(ex); - } - return serviceRestResponse; + ServiceRestResponse readMail(@RequestParam(CommonConstants.PROFILE_DB) String configuration) throws Exception { + digitalInvoiceMailService.readMailInbox(); + return ServiceRestResponse.createPositiveResponse(); } @RequestMapping(value = EmsRestConstants.PATH_FPX_TO_PDF, method = RequestMethod.POST) @@ -512,6 +506,7 @@ public class DocumentController { } return response; } + @RequestMapping(value = EmsRestConstants.PATH_CAMBIO_TIPO_DOC, method = RequestMethod.POST) public @ResponseBody List cambioTipoDoc(HttpServletRequest request, @@ -539,8 +534,8 @@ public class DocumentController { @RequestMapping(value = "cambioTipoDocPlan", method = RequestMethod.POST) public @ResponseBody ServiceRestResponse cambioTipoDocPlan(HttpServletRequest request, - HttpServletResponse response, - @RequestParam(CommonConstants.PROFILE_DB) String configuration ) throws Exception { + HttpServletResponse response, + @RequestParam(CommonConstants.PROFILE_DB) String configuration) throws Exception { try { cambioTipoDocPlanService.cambioTipoDoc(); @@ -708,8 +703,8 @@ public class DocumentController { @RequestMapping(value = EmsRestConstants.PATH_DOWNLOAD_DTB_DOC_XML_ESITO, method = RequestMethod.GET) public byte[] downloadDtbDocXmlEsito(HttpServletRequest request, HttpServletResponse response, - @RequestParam(CommonConstants.PROFILE_DB) String config, - @RequestParam String progSdi) throws Exception { + @RequestParam(CommonConstants.PROFILE_DB) String config, + @RequestParam String progSdi) throws Exception { DtbDocXml dtbDocXml = new DtbDocXml(); dtbDocXml.setProgSdi(progSdi); dtbDocXml.setOperation(OperationType.SELECT_OBJECT); @@ -1041,13 +1036,13 @@ public class DocumentController { @RequestMapping(value = "updateDtbDoctMRN", method = RequestMethod.POST) public @ResponseBody ServiceRestResponse updateDtbDoctMrn(HttpServletRequest request, - @RequestParam(CommonConstants.PROFILE_DB) String configuration, - @RequestParam String codDtip, - @RequestParam String codAnag, - @RequestParam Date dataDoc, - @RequestParam String serDoc, - @RequestParam Integer numDoc, - @RequestParam String mrn) { + @RequestParam(CommonConstants.PROFILE_DB) String configuration, + @RequestParam String codDtip, + @RequestParam String codAnag, + @RequestParam Date dataDoc, + @RequestParam String serDoc, + @RequestParam Integer numDoc, + @RequestParam String mrn) { try { return ServiceRestResponse.createPositiveResponse(documentService.updateDtbDoctMrn(codDtip, codAnag, dataDoc, serDoc, numDoc, mrn));