From 5b593496b8f1b8e8be8d7d2dbcc223332e65a49b Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 29 Jul 2018 16:13:45 +0300 Subject: re base code Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5 Issue-ID: SDC-1566 Signed-off-by: Michael Lando --- .../dao/impl/PermissionsManagerImpl.java | 16 +++------- .../dao/impl/PermissionsManagerImplTest.java | 35 +++++++++------------- 2 files changed, 18 insertions(+), 33 deletions(-) (limited to 'openecomp-be/backend/openecomp-sdc-item-permissions-manager') diff --git a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/main/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImpl.java b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/main/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImpl.java index 8f4f410c68..90b39bea6f 100644 --- a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/main/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImpl.java +++ b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/main/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImpl.java @@ -16,18 +16,6 @@ package org.openecomp.sdc.itempermissions.dao.impl; -import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.ITEM_ID_PROP; -import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.ITEM_NAME_PROP; -import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_CHANGED; -import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_GRANTED; -import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_ITEM; -import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_USER; - -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import java.util.Set; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.errors.ErrorCategory; import org.openecomp.sdc.common.errors.ErrorCode; @@ -45,6 +33,10 @@ import org.openecomp.sdc.notification.services.SubscriptionService; import org.openecomp.sdc.versioning.AsdcItemManager; import org.openecomp.sdc.versioning.types.Item; +import java.util.*; + +import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.*; + /** * Created by ayalaben on 6/18/2017. */ diff --git a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java index 83902c5f53..57944d8267 100644 --- a/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java +++ b/openecomp-be/backend/openecomp-sdc-item-permissions-manager/src/test/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsManagerImplTest.java @@ -16,27 +16,7 @@ package org.openecomp.sdc.itempermissions.dao.impl; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.verify; -import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.ITEM_ID_PROP; -import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_CHANGED; -import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_GRANTED; -import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.PERMISSION_ITEM; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - -import java.util.Collections; -import java.util.HashSet; -import java.util.Map; -import java.util.Set; -import java.util.stream.Collectors; -import java.util.stream.Stream; -import org.mockito.ArgumentCaptor; -import org.mockito.Captor; -import org.mockito.InjectMocks; -import org.mockito.Matchers; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; +import org.mockito.*; import org.openecomp.sdc.common.errors.CoreException; import org.openecomp.sdc.common.session.SessionContextProviderFactory; import org.openecomp.sdc.itempermissions.PermissionsServices; @@ -48,6 +28,19 @@ import org.openecomp.sdc.versioning.types.Item; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; +import java.util.Collections; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.verify; +import static org.openecomp.sdc.itempermissions.notifications.NotificationConstants.*; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + /** * Created by ayalaben on 7/6/2017 */ -- cgit 1.2.3-korg