Removing attached entity from method argument

[portal.git] / portal-BE / src / main / java / org / onap / portal / controller / WidgetsController.java

diff --git a/portal-BE/src/main/java/org/onap/portal/controller/WidgetsController.java b/portal-BE/src/main/java/org/onap/portal/controller/WidgetsController.java
index 556c7ef..5620204 100644 (file)
--- a/portal-BE/src/main/java/org/onap/portal/controller/WidgetsController.java
+++ b/portal-BE/src/main/java/org/onap/portal/controller/WidgetsController.java
@@ -50,12 +50,10 @@ import org.onap.portal.domain.dto.transport.FieldsValidator;
 import org.onap.portal.domain.dto.transport.OnboardingWidget;
 import org.onap.portal.domain.dto.transport.WidgetCatalogPersonalization;
 import org.onap.portal.logging.aop.EPAuditLog;
-import org.onap.portal.service.AdminRolesService;
 import org.onap.portal.service.PersUserWidgetService;
-import org.onap.portal.service.WidgetService;
-import org.onap.portal.service.fn.FnUserService;
+import org.onap.portal.service.widget.WidgetService;
+import org.onap.portal.service.user.FnUserService;
 import org.onap.portal.utils.EcompPortalUtils;
-import org.onap.portal.validation.DataValidator;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.EnableAspectJAutoProxy;
@@ -71,25 +69,19 @@ import org.springframework.web.bind.annotation.RestController;
 
 @EPAuditLog
 @RestController
-@EnableAspectJAutoProxy
 public class WidgetsController {
 
        private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(WidgetsController.class);
 
        private final FnUserService fnUserService;
        private final WidgetService widgetService;
-       private final AdminRolesService adminRolesService;
-       private final DataValidator dataValidator;
        private final PersUserWidgetService persUserWidgetService;
 
        @Autowired
        public WidgetsController(final FnUserService fnUserService, final WidgetService widgetService,
-               final AdminRolesService adminRolesService, final DataValidator dataValidator,
                final PersUserWidgetService persUserWidgetService) {
               this.fnUserService = fnUserService;
               this.widgetService = widgetService;
-              this.adminRolesService = adminRolesService;
-              this.dataValidator = dataValidator;
               this.persUserWidgetService = persUserWidgetService;
        }
 
@@ -103,7 +95,7 @@ public class WidgetsController {
               } else {
                      String getType = request.getHeader("X-Widgets-Type");
                      if (!getType.isEmpty() && ("managed".equals(getType) || "all".equals(getType))) {
-                            onboardingWidgets = widgetService.getOnboardingWidgets(user, "managed".equals(getType));
+                            onboardingWidgets = widgetService.getOnboardingWidgets(user.getOrgUserId(), user.getId(), "managed".equals(getType));
                      } else {
                             logger.debug(EELFLoggerDelegate.debugLogger,
                                     "WidgetsController.getOnboardingApps - request must contain header 'X-Widgets-Type' with 'all' or 'managed'");
@@ -127,7 +119,7 @@ public class WidgetsController {
               onboardingWidget.setId(widgetId);
               onboardingWidget.normalize();
               try {
-                     fieldsValidator = widgetService.setOnboardingWidget(user.getUserId(), onboardingWidget);
+                     fieldsValidator = widgetService.setOnboardingWidget(user.getId(), onboardingWidget);
                      response.setStatus(fieldsValidator.getHttpStatusCode().intValue());
               } catch (IllegalArgumentException e) {
                      fieldsValidator = new FieldsValidator();
@@ -153,7 +145,7 @@ public class WidgetsController {
               onboardingWidget.normalize();
 
               try {
-                     fieldsValidator = widgetService.setOnboardingWidget(user.getUserId(), onboardingWidget);
+                     fieldsValidator = widgetService.setOnboardingWidget(user.getId(), onboardingWidget);
               } catch (IllegalArgumentException e) {
                      fieldsValidator = new FieldsValidator();
                      fieldsValidator.setHttpStatusCode((long) HttpServletResponse.SC_NOT_ACCEPTABLE);
@@ -174,7 +166,7 @@ public class WidgetsController {
               FnUser user = fnUserService.loadUserByUsername(principal.getName());
               FieldsValidator fieldsValidator;
 
-              fieldsValidator = widgetService.deleteOnboardingWidget(user, widgetId);
+              fieldsValidator = widgetService.deleteOnboardingWidget(user.getOrgUserId(), user.getId(), widgetId);
               response.setStatus(fieldsValidator.getHttpStatusCode().intValue());
 
               EcompPortalUtils.logAndSerializeObject(logger, "/portalApi/widgets/" + widgetId, "DELETE result =",