Code Review / portal.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
Merge "Portal Spring Boot Development"
[portal.git] / ecomp-portal-BE-common / src / main / java / org / onap / portalapp / portal / controller / WidgetsCatalogController.java
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/WidgetsCatalogController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/WidgetsCatalogController.java
index d05fe01..57c73a8 100644 (file)
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/WidgetsCatalogController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/WidgetsCatalogController.java
@@ -60,7 +60,7 @@ import org.onap.portalapp.portal.domain.WidgetServiceHeaders;
 import org.onap.portalapp.portal.ecomp.model.PortalRestResponse;
 import org.onap.portalapp.portal.ecomp.model.PortalRestStatusEnum;
 import org.onap.portalapp.portal.logging.aop.EPAuditLog;
-import org.onap.portalapp.portal.service.ConsulHealthService;
+import org.onap.portalapp.portal.service.WidgetMService;
 import org.onap.portalapp.portal.service.MicroserviceService;
 import org.onap.portalapp.portal.service.WidgetParameterService;
 import org.onap.portalapp.portal.utils.EPCommonSystemProperties;
@@ -108,7 +108,7 @@ public class WidgetsCatalogController extends EPRestrictedBaseController {
        private String whatService = "widgets-service";
 
        @Autowired
-       private ConsulHealthService consulHealthService;
+       private WidgetMService widgetMService;
 
        @Autowired
        private MicroserviceService microserviceService;
@@ -138,7 +138,7 @@ public class WidgetsCatalogController extends EPRestrictedBaseController {
                try {
                        ResponseEntity<List> ans = template.exchange(
                                        EcompPortalUtils.widgetMsProtocol() + "://"
-                                                       + consulHealthService.getServiceLocation(whatService,
+                                                       + widgetMService.getServiceLocation(whatService,
                                                                        SystemProperties.getProperty(EPCommonSystemProperties.MS_WIDGET_LOCAL_PORT))
                                                        + "/widget/microservices/widgetCatalog/" + loginName,
                                        HttpMethod.GET, new HttpEntity<>(WidgetServiceHeaders.getInstance()), List.class);
@@ -158,7 +158,7 @@ public class WidgetsCatalogController extends EPRestrictedBaseController {
                try {
                        ResponseEntity<List> ans = template.exchange(
                                        EcompPortalUtils.widgetMsProtocol() + "://"
-                                                       + consulHealthService.getServiceLocation(whatService,
+                                                       + widgetMService.getServiceLocation(whatService,
                                                                        SystemProperties.getProperty(EPCommonSystemProperties.MS_WIDGET_LOCAL_PORT))
                                                        + "/widget/microservices/widgetCatalog",
                                        HttpMethod.GET, new HttpEntity<>(WidgetServiceHeaders.getInstance()), List.class);
@@ -177,7 +177,7 @@ public class WidgetsCatalogController extends EPRestrictedBaseController {
        public void updateWidgetCatalog(@RequestBody WidgetCatalog newWidgetCatalog, @PathVariable("widgetId") long widgetId) throws Exception {
                template.exchange(
                                EcompPortalUtils.widgetMsProtocol() + "://"
-                                               + consulHealthService.getServiceLocation(whatService,
+                                               + widgetMService.getServiceLocation(whatService,
                                                                SystemProperties.getProperty(MS_WIDGET_LOCAL_PORT))
                                                + "/widget/microservices/widgetCatalog/" + widgetId,
                                HttpMethod.PUT, new HttpEntity<>(newWidgetCatalog, WidgetServiceHeaders.getInstance()), String.class);
@@ -187,7 +187,7 @@ public class WidgetsCatalogController extends EPRestrictedBaseController {
        public void deleteOnboardingWidget(@PathVariable("widgetId") long widgetId) throws Exception {
                template.exchange(
                                EcompPortalUtils.widgetMsProtocol() + "://"
-                                               + consulHealthService.getServiceLocation(whatService,
+                                               + widgetMService.getServiceLocation(whatService,
                                                                SystemProperties.getProperty(MS_WIDGET_LOCAL_PORT))
                                                + "/widget/microservices/widgetCatalog/" + widgetId,
                                HttpMethod.DELETE, new HttpEntity<>(WidgetServiceHeaders.getInstance()), String.class);
@@ -218,7 +218,7 @@ public class WidgetsCatalogController extends EPRestrictedBaseController {
                        multipartRequest.add("widget", request.getParameter("newWidget"));
                        respond = template.postForObject(
                                        EcompPortalUtils.widgetMsProtocol() + "://"
-                                                       + consulHealthService.getServiceLocation(whatService,
+                                                       + widgetMService.getServiceLocation(whatService,
                                                                        SystemProperties.getProperty(EPCommonSystemProperties.MS_WIDGET_LOCAL_PORT))
                                                        + "/widget/microservices/widgetCatalog/" + widgetId,
                                        new HttpEntity<>(multipartRequest, WidgetServiceHeaders.getInstance()), String.class);
@@ -269,7 +269,7 @@ public class WidgetsCatalogController extends EPRestrictedBaseController {
 
                        respond = template.postForObject(
                                        EcompPortalUtils.widgetMsProtocol() + "://"
-                                                       + consulHealthService.getServiceLocation(whatService,
+                                                       + widgetMService.getServiceLocation(whatService,
                                                                        SystemProperties.getProperty(EPCommonSystemProperties.MS_WIDGET_LOCAL_PORT))
                                                        + "/widget/microservices/widgetCatalog",
                                        new HttpEntity<>(multipartRequest, WidgetServiceHeaders.getInstance()), String.class);
@@ -291,7 +291,7 @@ public class WidgetsCatalogController extends EPRestrictedBaseController {
        @RequestMapping(value = "/portalApi/microservices/{widgetId}/framework.js", method = RequestMethod.GET)
        public String getWidgetFramework(@PathVariable("widgetId") long widgetId) throws Exception {
                return template.getForObject(EcompPortalUtils.widgetMsProtocol() + "://"
-                               + consulHealthService.getServiceLocation(whatService,
+                               + widgetMService.getServiceLocation(whatService,
                                                SystemProperties.getProperty(MS_WIDGET_LOCAL_PORT))
                                + "/widget/microservices/" + widgetId + "/framework.js", String.class,
                                WidgetServiceHeaders.getInstance());
@@ -300,7 +300,7 @@ public class WidgetsCatalogController extends EPRestrictedBaseController {
        @RequestMapping(value = "/portalApi/microservices/{widgetId}/controller.js", method = RequestMethod.GET)
        public String getWidgetController(@PathVariable("widgetId") long widgetId) throws Exception {
                return template.getForObject(EcompPortalUtils.widgetMsProtocol() + "://"
-                               + consulHealthService.getServiceLocation(whatService,
+                               + widgetMService.getServiceLocation(whatService,
                                                SystemProperties.getProperty(MS_WIDGET_LOCAL_PORT))
                                + "/widget/microservices/" + widgetId + "/controller.js", String.class,
                                WidgetServiceHeaders.getInstance());
@@ -309,7 +309,7 @@ public class WidgetsCatalogController extends EPRestrictedBaseController {
        @RequestMapping(value = "/portalApi/microservices/{widgetId}/style.css", method = RequestMethod.GET)
        public String getWidgetCSS(@PathVariable("widgetId") long widgetId) throws Exception {
                return template.getForObject(EcompPortalUtils.widgetMsProtocol() + "://"
-                               + consulHealthService.getServiceLocation(whatService,
+                               + widgetMService.getServiceLocation(whatService,
                                                SystemProperties.getProperty(MS_WIDGET_LOCAL_PORT))
                                + "/widget/microservices/" + widgetId + "/styles.css", String.class,
                                WidgetServiceHeaders.getInstance());
@@ -323,7 +323,7 @@ public class WidgetsCatalogController extends EPRestrictedBaseController {
                List<WidgetParameterResult> list = new ArrayList<>();
                Long serviceId = template.exchange(
                                EcompPortalUtils.widgetMsProtocol() + "://"
-                                               + consulHealthService.getServiceLocation(whatService,
+                                               + widgetMService.getServiceLocation(whatService,
                                                                SystemProperties.getProperty(EPCommonSystemProperties.MS_WIDGET_LOCAL_PORT))
                                                + "/widget/microservices/widgetCatalog/parameters/" + widgetId,
                                HttpMethod.GET, new HttpEntity<>(WidgetServiceHeaders.getInstance()), Long.class).getBody();
@@ -370,39 +370,45 @@ public class WidgetsCatalogController extends EPRestrictedBaseController {
                byte[] byteFile = template
                                .exchange(
                                                EcompPortalUtils.widgetMsProtocol() + "://"
-                                                               + consulHealthService.getServiceLocation(whatService,
+                                                               + widgetMService.getServiceLocation(whatService,
                                                                                SystemProperties.getProperty(EPCommonSystemProperties.MS_WIDGET_LOCAL_PORT))
                                                                + "/widget/microservices/download/" + widgetId,
                                                HttpMethod.GET, new HttpEntity<>(WidgetServiceHeaders.getInstance()), byte[].class)
                                .getBody();
 
                File downloadFile = File.createTempFile("temp", ".zip");
-               FileOutputStream stream = new FileOutputStream(downloadFile.getPath());
-               stream.write(byteFile);
-               stream.close();
-
-               FileInputStream inputStream = new FileInputStream(downloadFile);
-               String mimeType = context.getMimeType(downloadFile.getPath());
-               if (mimeType == null) {
-                       mimeType = "application/octet-stream";
+               try(FileOutputStream stream = new FileOutputStream(downloadFile.getPath())){
+                       stream.write(byteFile);
+               }catch(Exception e)
+               {
+                       logger.error(EELFLoggerDelegate.errorLogger, "doDownload failed", e);
+                       throw e;
                }
 
-               response.setContentType(mimeType);
-               response.setContentLength((int) downloadFile.length());
-               String headerKey = "Content-Disposition";
-               String headerValue = String.format("attachment; filename=\"%s\"", downloadFile.getName());
-               downloadFile.delete();
-               response.setHeader(headerKey, headerValue);
-
-               OutputStream outStream = response.getOutputStream();
-               byte[] buffer = new byte[32 * 1024];
-               int bytesRead;
-               while ((bytesRead = inputStream.read(buffer)) != -1) {
-                       outStream.write(buffer, 0, bytesRead);
-               }
+               try(FileInputStream inputStream = new FileInputStream(downloadFile);
+                       OutputStream outStream = response.getOutputStream()){
+                       String mimeType = context.getMimeType(downloadFile.getPath());
+                       if (mimeType == null) {
+                               mimeType = "application/octet-stream";
+                       }
 
-               inputStream.close();
-               outStream.close();
+                       response.setContentType(mimeType);
+                       response.setContentLength((int) downloadFile.length());
+                       String headerKey = "Content-Disposition";
+                       String headerValue = String.format("attachment; filename=\"%s\"", downloadFile.getName());
+                       downloadFile.delete();
+                       response.setHeader(headerKey, headerValue);
+       
+                       byte[] buffer = new byte[32 * 1024];
+                       int bytesRead;
+                       while ((bytesRead = inputStream.read(buffer)) != -1) {
+                               outStream.write(buffer, 0, bytesRead);
+                       }
+               }catch(Exception e)
+               {
+                       logger.error(EELFLoggerDelegate.errorLogger, "doDownload failed", e);
+                       throw e;
+               }
        }
 
        @RequestMapping(value = { "/portalApi/microservices/parameters" }, method = RequestMethod.POST)
ARCHIVED- 2022-02-15 at the request of the project