Refactor UtilityController

ems-engine/src/main/java/it/integry/ems/utility/controller/UtilityController.java

@@ -6,14 +6,12 @@ import it.integry.ems.response.EsitoType;
 import it.integry.ems.response.ServiceRestResponse;
 import it.integry.ems.response.StatusResponse;
 import it.integry.ems.status.ServiceChecker;
-import it.integry.ems.sync.MultiDBTransaction.MultiDBTransactionManager;
 import it.integry.ems.utility.dto.C2EArgDTO;
 import it.integry.ems.utility.dto.PdfDTO;
 import it.integry.ems.utility.request.SqlToExcelRequest;
 import it.integry.ems.utility.service.UtilityService;
 import it.integry.ems_model.config.EmsRestConstants;
 import it.integry.ems_model.utility.BarcodeEan128.UtilityBarcodeEan128;
-import it.integry.ems_model.utility.dto.IndirizzoDTO;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,9 +42,6 @@ public class UtilityController {
     @Autowired
     private ServiceChecker serviceChecker;
 
-    @Autowired
-    private MultiDBTransactionManager multiDBTransactionManager;
-
     @RequestMapping(value = "/utility/status", method = RequestMethod.GET)
     public @ResponseBody
     List<StatusResponse> status(HttpServletRequest request) {
@@ -60,44 +55,26 @@ public class UtilityController {
     public @ResponseBody
     ServiceRestResponse mergePDF(HttpServletRequest request,
                                  @RequestParam(CommonConstants.PROFILE_DB) String configuration,
-                                 @RequestBody List<PdfDTO> pdfList) {
+                                 @RequestBody List<PdfDTO> pdfList) throws Exception {
-        ServiceRestResponse response = null;
+
-        try {
+        return utilityService.mergePDF(pdfList);
-            response = utilityService.mergePDF(pdfList);
-        } catch (Exception e) {
-            logger.error(request.getRequestURI(), e);
-            response = new ServiceRestResponse(EsitoType.KO, configuration, e);
-        }
-        return response;
     }
 
     @RequestMapping(value = EmsRestConstants.PATH_SPLIT_PDF, method = RequestMethod.POST)
     public @ResponseBody
     Object splitPDF(HttpServletRequest request,
                     @RequestParam(CommonConstants.PROFILE_DB) String configuration,
-                    @RequestBody List<PdfDTO> pdfList) {
+                    @RequestBody List<PdfDTO> pdfList) throws Exception {
-        ServiceRestResponse response = null;
+
-        try {
+        return utilityService.splitPDF(pdfList);
-            response = utilityService.splitPDF(pdfList);
-        } catch (Exception e) {
-            logger.error(request.getRequestURI(), e);
-            response = new ServiceRestResponse(EsitoType.KO, configuration, e);
-        }
-        return response;
     }
 
     @RequestMapping(value = EmsRestConstants.PATH_GEOCODE, method = RequestMethod.GET)
     public @ResponseBody
     ServiceRestResponse geocode(HttpServletRequest request,
-                                @RequestParam("address") String address) {
+                                @RequestParam("address") String address) throws Exception {
-        ServiceRestResponse response;
+
-        try {
+        return utilityService.geocode(address);
-            response = utilityService.geocode(address);
-        } catch (Exception e) {
-            logger.error(request.getRequestURI(), e);
-            response = new ServiceRestResponse(EsitoType.KO, "", e);
-        }
-        return response;
     }
 
 
@@ -105,15 +82,9 @@ public class UtilityController {
     public @ResponseBody
     Object cmd2Export(HttpServletRequest request,
                       @RequestParam(CommonConstants.PROFILE_DB) String configuration,
-                      @RequestBody C2EArgDTO arguments) {
+                      @RequestBody C2EArgDTO arguments) throws Exception {
-        ServiceRestResponse response = null;
+
-        try {
+        return utilityService.cmd2Export(arguments);
-            response = utilityService.cmd2Export(arguments);
-        } catch (Exception e) {
-            logger.error(request.getRequestURI(), e);
-            response = new ServiceRestResponse(EsitoType.KO, configuration, e);
-        }
-        return response;
     }
 
     @RequestMapping(value = EmsRestConstants.PATH_VALIDATE_XML_BY_SCHEMA, method = RequestMethod.POST)
@@ -150,18 +121,10 @@ public class UtilityController {
     @RequestMapping(value = EmsRestConstants.PATH_SQL_TO_EXCEL, method = RequestMethod.POST)
     public @ResponseBody
     ServiceRestResponse getXlsFromSql(@RequestBody SqlToExcelRequest payload) throws Exception {
-        ServiceRestResponse response = new ServiceRestResponse();
         String query = payload.getSql();
         List<String> fields = payload.getFields();
-        try {
+
-            byte[] file = utilityService.getXlsFromSqlQuery(query, fields);
+        return ServiceRestResponse.createPositiveResponse(utilityService.getXlsFromSqlQuery(query, fields));
-            response.setEsito(EsitoType.OK);
-            response.setJsonObject(file);
-        } catch (Exception e) {
-            response.setEsito(EsitoType.KO);
-            response.setErrorMessage(e.getMessage());
-        }
-        return response;
     }
 
     @RequestMapping(value = EmsRestConstants.PATH_READ_REMOTE_FILE, method = RequestMethod.POST)
@@ -220,24 +183,12 @@ public class UtilityController {
 
     @RequestMapping(value = EmsRestConstants.PATH_GET_POSITION_FROM_COORDS, method = RequestMethod.GET)
     public @ResponseBody
-    ServiceRestResponse getPositionFromCoords(
+    ServiceRestResponse getPositionFromCoords(HttpServletRequest request,
-            HttpServletRequest request,
+                                              @RequestParam(CommonConstants.PROFILE_DB) String configuration,
-            @RequestParam(CommonConstants.PROFILE_DB) String configuration,
+                                              @RequestParam BigDecimal lat,
-            @RequestParam BigDecimal lat,
+                                              @RequestParam BigDecimal lng) throws Exception {
-            @RequestParam BigDecimal lng
-    ) {
 
-        ServiceRestResponse response;
+        return ServiceRestResponse.createPositiveResponse(utilityService.getPositionFromCoords(lat, lng));
-        try {
-            IndirizzoDTO indirizzo = utilityService.getPositionFromCoords(lat, lng);
-            response = new ServiceRestResponse(EsitoType.OK);
-            response.setJsonObject(indirizzo);
-            return response;
-        } catch (Exception e) {
-            logger.error(request.getRequestURI(), e);
-            response = new ServiceRestResponse(EsitoType.KO, configuration, e);
-        }
-        return response;
     }
 
     @RequestMapping(value = EmsRestConstants.PATH_GET_RICORRENZE, method = RequestMethod.GET)
@@ -245,11 +196,6 @@ public class UtilityController {
                                              @RequestParam(CommonConstants.PROFILE_DB) String config,
                                              @RequestParam(value = "anno") String anno) throws Exception {
 
-        try {
+        return ServiceRestResponse.createPositiveResponse(utilityService.getRicorrenze(anno));
-            return ServiceRestResponse.createPositiveResponse(utilityService.getRicorrenze(anno));
-        } catch (Exception e) {
-            logger.error(request.getRequestURI(), e);
-            return ServiceRestResponse.createNegativeResponse(e);
-        }
     }
 }