diff options
author | Parshad Patel <pars.patel@samsung.com> | 2019-08-06 19:41:24 +0900 |
---|---|---|
committer | Parshad Patel <pars.patel@samsung.com> | 2019-08-06 19:43:20 +0900 |
commit | 6f8f97e9d53f6fefaa7e1523fe241617df1f48b4 (patch) | |
tree | f00a5f253099ec25026bf2a789ca8181969ebd30 /ecomp-portal-widget-ms/widget-ms/src | |
parent | 4b7993a3e61c9afea0674ec6a81fb1bcb13c8189 (diff) |
Fix sonar issues in portal
Use a logger to log this exception
Make sure creating this cookie without the "secure" flag is safe here
Either re-interrupt this method or rethrow the "InterruptedException"
Issue-ID: PORTAL-562
Change-Id: I91d6adce835d9adec4328642e8445f074f7d2d57
Signed-off-by: Parshad Patel <pars.patel@samsung.com>
Diffstat (limited to 'ecomp-portal-widget-ms/widget-ms/src')
-rw-r--r-- | ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/WidgetsCatalogController.java | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/WidgetsCatalogController.java b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/WidgetsCatalogController.java index 31f9b95f..b1450b6d 100644 --- a/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/WidgetsCatalogController.java +++ b/ecomp-portal-widget-ms/widget-ms/src/main/java/org/onap/portalapp/widget/controller/WidgetsCatalogController.java @@ -73,7 +73,7 @@ public class WidgetsCatalogController { widgetCatalog = widgetCatalogService.getWidgetCatalog(); logger.debug("WidgetsCatalogController.getWidgetCatalog: getting widget list {}", widgetCatalog); } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.getWidgetCatalog in widget microservices. Details:" + e.getMessage()); + logger.error("Exception occurred while performing WidgetsCatalogController.getWidgetCatalog in widget microservices. Details:", e); } return widgetCatalog; } @@ -92,7 +92,7 @@ public class WidgetsCatalogController { widgetCatalog = widgetCatalogService.getUserWidgetCatalog(loginName); logger.debug("WidgetsCatalogController.getUserWidgetCatalog: getting widget list {}", widgetCatalog); } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.getUserWidgetCatalog in widget microservices. Details:" + e.getMessage()); + logger.error("Exception occurred while performing WidgetsCatalogController.getUserWidgetCatalog in widget microservices. Details:", e); } return widgetCatalog; } @@ -112,8 +112,7 @@ public class WidgetsCatalogController { widgetCatalogService.updateWidgetCatalog(widgetId, newWidgetCatalog); logger.debug("WidgetsCatalogController.updateWidgetCatalog: updating widget {}", newWidgetCatalog); } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.updateWidgetCatalog in widget microservices. Details:" + e.getMessage()); - e.printStackTrace(); + logger.error("Exception occurred while performing WidgetsCatalogController.updateWidgetCatalog in widget microservices. Details:", e); } } @@ -152,7 +151,7 @@ public class WidgetsCatalogController { @RequestMapping(value = { "/microservices/widgetCatalog/{widgetId}" }, method = RequestMethod.POST, produces = "application/json") public ValidationRespond updateWidgetCatalogwithFiles(HttpServletRequest request, HttpServletResponse response, @RequestHeader(value="Authorization") String auth, @RequestParam("file") MultipartFile file, @RequestParam("widget") String widget, @PathVariable("widgetId") long widgetId) throws IOException { - System.out.println("microserivces updating with files" + widgetId); + logger.debug("microserivces updating with files {}", widgetId); ValidationRespond respond = null; if(!util.authorization(auth, security_user, security_pass)){ response.sendError(HttpServletResponse.SC_UNAUTHORIZED); @@ -171,8 +170,7 @@ public class WidgetsCatalogController { storageService.update(file, newWidget, widgetId); } } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.saveWidgetCatalog in widget microservices. Details:" + e.getMessage()); - e.printStackTrace(); + logger.error("Exception occurred while performing WidgetsCatalogController.saveWidgetCatalog in widget microservices. Details:", e); } return respond; } @@ -193,7 +191,7 @@ public class WidgetsCatalogController { widgetCatalogService.deleteWidgetCatalog(widgetId); storageService.deleteWidgetFile(widgetId); } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.deleteOnboardingWidget in widget microservices. Details:" + e.getMessage()); + logger.error("Exception occurred while performing WidgetsCatalogController.deleteOnboardingWidget in widget microservices. Details:", e); } } @@ -212,7 +210,7 @@ public class WidgetsCatalogController { logger.debug("WidgetsCatalogController.getServiceIdByWidget: getting service Id for widget {}", widgetId); serviceId = widgetCatalogService.getServiceIdByWidget(widgetId); }catch(Exception e){ - logger.error("Exception occurred while performing WidgetsCatalogController.getServiceIdByWidget in widget microservices. Details:" + e.getMessage()); + logger.error("Exception occurred while performing WidgetsCatalogController.getServiceIdByWidget in widget microservices. Details:", e); } return serviceId; } @@ -222,7 +220,7 @@ public class WidgetsCatalogController { @RequestMapping(value = { "/microservices/widgetCatalog/service/{serviceId}" }, method = RequestMethod.GET, produces = "application/json") public List<WidgetCatalog> getWidgetByServiceId(HttpServletRequest request, HttpServletResponse response, @PathVariable("serviceId") Long serviceId, @RequestHeader(value="Authorization") String auth) throws IOException { - List<WidgetCatalog> list = new ArrayList<WidgetCatalog>(); + List<WidgetCatalog> list = new ArrayList<>(); if(!util.authorization(auth, security_user, security_pass)){ response.sendError(HttpServletResponse.SC_UNAUTHORIZED); logger.error("Basic Authentication Error while performing WidgetsCatalogController.getWidgetByServiceId in widget microserivce. Please check your username and password."); @@ -232,7 +230,7 @@ public class WidgetsCatalogController { logger.debug("WidgetsCatalogController.getWidgetByServiceId: getting service Id for widget {}", serviceId); list = widgetCatalogService.getWidgetsByServiceId(serviceId); }catch(Exception e){ - logger.error("Exception occurred while performing WidgetsCatalogController.getWidgetByServiceId in widget microservices. Details:" + e.getMessage()); + logger.error("Exception occurred while performing WidgetsCatalogController.getWidgetByServiceId in widget microservices. Details:", e); } return list; } @@ -252,7 +250,7 @@ public class WidgetsCatalogController { byteFile = storageService.getWidgetCatalogContent(widgetId); logger.debug("WidgetsCatalogController.getWidgetZipFile: getting widget zip file for widget with id {}", widgetId); } catch (Exception e) { - logger.error("Exception occurred while performing WidgetsCatalogController.getWidgetZipFile in widget microservices. Details:" + e.getMessage()); + logger.error("Exception occurred while performing WidgetsCatalogController.getWidgetZipFile in widget microservices. Details:", e); } return byteFile; } |