*
* ============LICENSE_END============================================
*
- *
+ *
*/
package org.onap.portalapp.portal.controller;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
-import java.io.IOException;
import java.io.OutputStream;
import java.util.ArrayList;
import java.util.List;
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;
private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WidgetsCatalogController.class);
private static final String MS_WIDGET_LOCAL_PORT = "microservices.widget.local.port";
-
+
private static final String UNAUTHORIZED_OR_FORBIDDEN_FOR_A_DISABLED_USER = "Unauthorized or Forbidden for a disabled user";
+ private static final String MS_WIDGET_CATALOG_URL = "/widget/microservices/widgetCatalog/";
+
+ private static final String MS_WIDGET_URL = "/widget/microservices/";
+
private RestTemplate template = new RestTemplate();
private String whatService = "widgets-service";
@Autowired
- private ConsulHealthService consulHealthService;
+ private WidgetMService widgetMService;
@Autowired
private MicroserviceService microserviceService;
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,
+ + MS_WIDGET_CATALOG_URL + loginName,
HttpMethod.GET, new HttpEntity<>(WidgetServiceHeaders.getInstance()), List.class);
widgets = ans.getBody();
} catch (Exception e) {
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);
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,
+ + MS_WIDGET_CATALOG_URL + widgetId,
HttpMethod.PUT, new HttpEntity<>(newWidgetCatalog, WidgetServiceHeaders.getInstance()), String.class);
}
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,
+ + MS_WIDGET_CATALOG_URL + widgetId,
HttpMethod.DELETE, new HttpEntity<>(WidgetServiceHeaders.getInstance()), String.class);
}
String fileName;
String tmpFolderName = "/tmp/";
String respond = null;
- FileOutputStream fo = null;
- try {
- mRequest = (MultipartHttpServletRequest) request;
- MultipartFile mFile = mRequest.getFile("file");
- fileName = mFile.getOriginalFilename();
- fo = new FileOutputStream(tmpFolderName + fileName);
- fo.write(mFile.getBytes());
- // silence sonar scan by calling close here
- fo.close();
- fo = null;
+ try {
+ mRequest = (MultipartHttpServletRequest) request;
+ MultipartFile mFile = mRequest.getFile("file");
+ fileName = mFile.getOriginalFilename();
+ try (FileOutputStream fo = new FileOutputStream(tmpFolderName + fileName)) {
+ fo.write(mFile.getBytes());
+ }
HttpHeaders header = new HttpHeaders();
header.setContentType(MediaType.MULTIPART_FORM_DATA);
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,
+ + MS_WIDGET_CATALOG_URL + widgetId,
new HttpEntity<>(multipartRequest, WidgetServiceHeaders.getInstance()), String.class);
File f = new File(tmpFolderName + fileName);
f.delete();
} catch (Exception e) {
logger.error(EELFLoggerDelegate.errorLogger, "updateWidgetCatalogWithFiles failed", e);
- } finally {
- try {
- if (fo != null)
- fo.close();
- } catch (IOException e) {
- logger.error(EELFLoggerDelegate.errorLogger, "updateWidgetCatalogWithFiles failed 2", e);
- }
- }
+ }
return respond;
}
@RequestMapping(value = { "/portalApi/microservices/widgetCatalog" }, method = RequestMethod.POST)
public String createWidgetCatalog(HttpServletRequest request)
throws Exception {
-
+
if (StringUtils.isNotBlank(SystemProperties.getProperty(EPCommonSystemProperties.MS_WIDGET_UPLOAD_FLAG))
- && SystemProperties.getProperty(EPCommonSystemProperties.MS_WIDGET_UPLOAD_FLAG).equalsIgnoreCase("false")) {
+ && "false".equalsIgnoreCase(
+ SystemProperties.getProperty(EPCommonSystemProperties.MS_WIDGET_UPLOAD_FLAG))) {
return UNAUTHORIZED_OR_FORBIDDEN_FOR_A_DISABLED_USER;
}
-
+
MultipartHttpServletRequest mRequest;
MultiValueMap<String, Object> multipartRequest = new LinkedMultiValueMap<>();
String fileName;
String tmpFolderName = "/tmp/";
String respond = null;
- FileOutputStream fo = null;
try {
mRequest = (MultipartHttpServletRequest) request;
MultipartFile mFile = mRequest.getFile("file");
fileName = mFile.getOriginalFilename();
- fo = new FileOutputStream(tmpFolderName + fileName);
- fo.write(mFile.getBytes());
- // silence sonar scan by calling close here
- fo.close();
- fo = null;
+ try (FileOutputStream fo = new FileOutputStream(tmpFolderName + fileName)) {
+ fo.write(mFile.getBytes());
+ }
HttpHeaders header = new HttpHeaders();
header.setContentType(MediaType.MULTIPART_FORM_DATA);
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);
f.delete();
} catch (Exception e) {
logger.error(EELFLoggerDelegate.errorLogger, "createWidgetCatalog failed", e);
- } finally {
- try {
- if (fo != null)
- fo.close();
- } catch (IOException e) {
- logger.error(EELFLoggerDelegate.errorLogger, "createWidgetCatalog failed 2", e);
- }
}
return respond;
}
@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,
+ + MS_WIDGET_URL + widgetId + "/framework.js", String.class,
WidgetServiceHeaders.getInstance());
}
@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,
+ + MS_WIDGET_URL + widgetId + "/controller.js", String.class,
WidgetServiceHeaders.getInstance());
}
@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,
+ + MS_WIDGET_URL + widgetId + "/styles.css", String.class,
WidgetServiceHeaders.getInstance());
}
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();
if (serviceId == null) {
// return ok/sucess and no service parameter for this widget
- return new PortalRestResponse<List<WidgetParameterResult>>(PortalRestStatusEnum.WARN,
+ return new PortalRestResponse<>(PortalRestStatusEnum.WARN,
"No service parameters for this widget", list);
} else {
List<MicroserviceParameter> defaultParam = microserviceService.getParametersById(serviceId);
list.add(userResult);
}
}
- return new PortalRestResponse<List<WidgetParameterResult>>(PortalRestStatusEnum.OK, "SUCCESS", list);
+ return new PortalRestResponse<>(PortalRestStatusEnum.OK, "SUCCESS", list);
}
@RequestMapping(value = { "/portalApi/microservices/services/{paramId}" }, method = RequestMethod.GET)
public List<WidgetCatalogParameter> getUserParameterById( @PathVariable("paramId") long paramId) {
- List<WidgetCatalogParameter> list = widgetParameterService.getUserParameterById(paramId);
- return list;
+ return widgetParameterService.getUserParameterById(paramId);
}
@RequestMapping(value = { "/portalApi/microservices/services/{paramId}" }, method = RequestMethod.DELETE)
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)
} catch (Exception e) {
logger.error(EELFLoggerDelegate.errorLogger, "saveWidgetParameter failed", e);
- return new PortalRestResponse<String>(PortalRestStatusEnum.ERROR, "FAILURE", e.getMessage());
+ return new PortalRestResponse<>(PortalRestStatusEnum.ERROR, "FAILURE", e.getMessage());
}
- return new PortalRestResponse<String>(PortalRestStatusEnum.OK, "SUCCESS", "");
+ return new PortalRestResponse<>(PortalRestStatusEnum.OK, "SUCCESS", "");
}
-
+
@RequestMapping(value = { "/portalApi/microservices/uploadFlag" }, method = RequestMethod.GET)
public String getUploadFlag() {
String uplaodFlag="";
Code Review / portal.git / blobdiff