1 files changed, 9 insertions, 31 deletions
diff --git a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/main/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImpl.java b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/main/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImpl.java
index d0e41d8c91..7e9d289731 100644
--- a/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/main/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImpl.java
+++ b/openecomp-be/lib/openecomp-item-permissions-lib/openecomp-item-permissions-core/src/main/java/org/openecomp/sdc/itempermissions/dao/impl/PermissionsServicesImpl.java
@@ -13,13 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.sdc.itempermissions.dao.impl;
 
 import java.util.Collection;
 import java.util.Optional;
 import java.util.Set;
-
 import org.openecomp.sdc.common.session.SessionContextProviderFactory;
 import org.openecomp.sdc.itempermissions.PermissionsRules;
 import org.openecomp.sdc.itempermissions.PermissionsServices;
@@ -27,29 +25,22 @@ import org.openecomp.sdc.itempermissions.dao.ItemPermissionsDao;
 import org.openecomp.sdc.itempermissions.dao.UserPermissionsDao;
 import org.openecomp.sdc.itempermissions.type.ItemPermissionsEntity;
 
-
 /**
  * Created by ayalaben on 6/22/2017.
  */
 public class PermissionsServicesImpl implements PermissionsServices {
 
+    private static final String CHANGE_PERMISSIONS = "Change_Item_Permissions";
     private ItemPermissionsDao itemPermissionsDao;
-
     private UserPermissionsDao userPermissionsDao;
-
     private PermissionsRules permissionsRules;
 
-    private static final String CHANGE_PERMISSIONS = "Change_Item_Permissions";
-
-    public PermissionsServicesImpl(PermissionsRules permissionsRules,
-                                   ItemPermissionsDao itemPermissionsDao,
-                                   UserPermissionsDao userPermissionsDao) {
+    public PermissionsServicesImpl(PermissionsRules permissionsRules, ItemPermissionsDao itemPermissionsDao, UserPermissionsDao userPermissionsDao) {
         this.itemPermissionsDao = itemPermissionsDao;
         this.permissionsRules = permissionsRules;
         this.userPermissionsDao = userPermissionsDao;
     }
 
-
     @Override
     public Collection<ItemPermissionsEntity> listItemPermissions(String itemId) {
         return itemPermissionsDao.listItemPermissions(itemId);
@@ -61,30 +52,18 @@ public class PermissionsServicesImpl implements PermissionsServices {
     }
 
     @Override
-    public void updateItemPermissions(String itemId, String permission, Set<String> addedUsersIds,
-                                      Set<String> removedUsersIds) {
-
-        String currentUserId = SessionContextProviderFactory.getInstance()
-                .createInterface().get().getUser().getUserId();
-
+    public void updateItemPermissions(String itemId, String permission, Set<String> addedUsersIds, Set<String> removedUsersIds) {
+        String currentUserId = SessionContextProviderFactory.getInstance().createInterface().get().getUser().getUserId();
         permissionsRules.executeAction(itemId, currentUserId, CHANGE_PERMISSIONS);
-
-        permissionsRules.updatePermission(itemId, currentUserId, permission, addedUsersIds,
-                removedUsersIds);
-
-        itemPermissionsDao.updateItemPermissions(itemId, permission,
-                addedUsersIds, removedUsersIds);
-
-        userPermissionsDao.updatePermissions(itemId, permission,
-                addedUsersIds, removedUsersIds);
-
+        permissionsRules.updatePermission(itemId, currentUserId, permission, addedUsersIds, removedUsersIds);
+        itemPermissionsDao.updateItemPermissions(itemId, permission, addedUsersIds, removedUsersIds);
+        userPermissionsDao.updatePermissions(itemId, permission, addedUsersIds, removedUsersIds);
     }
 
     @Override
     public boolean isAllowed(String itemId, String userId, String action) {
-        return itemPermissionsDao.getUserItemPermission(itemId, userId)
-                .map(permission -> permissionsRules.isAllowed(permission, action))
-                .orElse(false);
+        return itemPermissionsDao.getUserItemPermission(itemId, userId).map(permission -> permissionsRules.isAllowed(permission, action))
+            .orElse(false);
     }
 
     @Override
@@ -101,5 +80,4 @@ public class PermissionsServicesImpl implements PermissionsServices {
     public void deleteItemPermissions(String itemId) {
         itemPermissionsDao.deleteItemPermissions(itemId);
     }
-
 }