X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=portal-BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportal%2Fcontroller%2FWidgetsCatalogController.java;h=597794480838692bde671287fe49a52c7541c3db;hb=ffd9af970318c1f5a0bad46d7aad5d4611414aae;hp=d1039f0cb1731006752d28991e35d5ad367645bd;hpb=e90cfa3b65b9879d22fc4522f45a22f1014e224e;p=portal.git

diff --git a/portal-BE/src/main/java/org/onap/portal/controller/WidgetsCatalogController.java b/portal-BE/src/main/java/org/onap/portal/controller/WidgetsCatalogController.java
index d1039f0c..59779448 100644
--- a/portal-BE/src/main/java/org/onap/portal/controller/WidgetsCatalogController.java
+++ b/portal-BE/src/main/java/org/onap/portal/controller/WidgetsCatalogController.java
@@ -92,12 +92,12 @@ import org.springframework.web.multipart.MultipartHttpServletRequest;
 @EPAuditLog
 public class WidgetsCatalogController {
 
-       private EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WidgetsCatalogController.class);
+       private final 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 RestTemplate template = new RestTemplate();
-       private String whatService = "widgets-service";
+       private final RestTemplate template = new RestTemplate();
+       private final String whatService = "widgets-service";
 
        private final EpWidgetCatalogParameterService epWidgetCatalogParameterService;
        private final EpMicroserviceParameterService epMicroserviceParameterService;
@@ -301,7 +301,8 @@ public class WidgetsCatalogController {
        }
 
        @GetMapping(value = {"/portalApi/microservices/parameters/{widgetId}"})
-       public PortalRestResponse<List<WidgetParameterResult>> getWidgetParameterResult(Principal principal, HttpServletRequest request,
+       public PortalRestResponse<List<WidgetParameterResult>> getWidgetParameterResult(Principal principal,
+               HttpServletRequest request,
                @PathVariable("widgetId") long widgetId) throws Exception {
               FnUser user = fnUserService.loadUserByUsername(principal.getName());
 
@@ -317,7 +318,8 @@ public class WidgetsCatalogController {
                      return new PortalRestResponse<>(PortalRestStatusEnum.WARN,
                              "No service parameters for this widget", list);
               } else {
-                     List<MicroserviceParameter> defaultParam = epMicroserviceParameterService.getParametersById(serviceId);
+                     List<MicroserviceParameter> defaultParam = epMicroserviceParameterService
+                             .getParametersById(serviceId);
                      for (MicroserviceParameter param : defaultParam) {
                             WidgetParameterResult userResult = new WidgetParameterResult();
                             userResult.setParamId(param.getId());
@@ -334,7 +336,7 @@ public class WidgetsCatalogController {
                             list.add(userResult);
                      }
               }
-              return new PortalRestResponse<List<WidgetParameterResult>>(PortalRestStatusEnum.OK, "SUCCESS", list);
+              return new PortalRestResponse<>(PortalRestStatusEnum.OK, "SUCCESS", list);
        }
 
        @GetMapping(value = {"/portalApi/microservices/services/{paramId}"})
@@ -343,8 +345,14 @@ public class WidgetsCatalogController {
        }
 
        @DeleteMapping(value = {"/portalApi/microservices/services/{paramId}"})
-       public void deleteUserParameterById(@PathVariable("paramId") long paramId) {
-              epWidgetCatalogParameterService.deleteUserParameterById(paramId);
+       public boolean deleteUserParameterById(@PathVariable("paramId") long paramId) {
+              try {
+                     epWidgetCatalogParameterService.deleteUserParameterById(paramId);
+                     return true;
+              } catch (Exception e) {
+                     logger.error(EELFLoggerDelegate.errorLogger, e.getMessage());
+                     return false;
+              }
        }
 
        @GetMapping(value = {"/portalApi/microservices/download/{widgetId}"})
@@ -395,7 +403,7 @@ public class WidgetsCatalogController {
        }
 
        @PostMapping(value = {"/portalApi/microservices/parameters"})
-       public PortalRestResponse<String> saveWidgetParameter(Principal principal, HttpServletRequest request,
+       public PortalRestResponse<String> saveWidgetParameter(Principal principal,
                @RequestBody EpWidgetCatalogParameter widgetParameters) {
               FnUser user = fnUserService.loadUserByUsername(principal.getName());
               widgetParameters.setUserId(user);
@@ -404,20 +412,25 @@ public class WidgetsCatalogController {
                              .getUserParamById(widgetParameters.getWidgetId().getWidgetId(),
                                      widgetParameters.getUserId().getId(), widgetParameters.getParamId().getId());
                      if (oldParam != null) {
-                            widgetParameters.setId(oldParam.getId());
+                            oldParam.setParamId(widgetParameters.getParamId());
+                            oldParam.setUserId(widgetParameters.getUserId());
+                            oldParam.setUserValue(widgetParameters.getUserValue());
+                            oldParam.setWidgetId(widgetParameters.getWidgetId());
+                            epWidgetCatalogParameterService.saveUserParameter(oldParam);
+                     } else {
+                            epWidgetCatalogParameterService.saveUserParameter(widgetParameters);
                      }
-                     epWidgetCatalogParameterService.saveUserParameter(widgetParameters);
 
               } 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<>(PortalRestStatusEnum.OK, "SUCCESS", "");
        }
 
        @GetMapping(value = {"/portalApi/microservices/uploadFlag"})
        public String getUploadFlag() {
-              String uplaodFlag = "";
+              String uplaodFlag;
               try {
                      uplaodFlag = SystemProperties.getProperty(EPCommonSystemProperties.MS_WIDGET_UPLOAD_FLAG);
               } catch (Exception e) {