1 files changed, 36 insertions, 45 deletions
diff --git a/openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/store/PermissionHandler.java b/openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/store/PermissionHandler.java
index 1a339e80f3..d3e31b12e0 100644
--- a/openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/store/PermissionHandler.java
+++ b/openecomp-be/tools/zusammen-tools/src/main/java/org/openecomp/core/tools/store/PermissionHandler.java
@@ -7,9 +7,9 @@
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at
- * 
+ *
  *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -17,7 +17,6 @@
  * limitations under the License.
  * ============LICENSE_END=========================================================
  */
-
 package org.openecomp.core.tools.store;
 
 import com.datastax.driver.core.ResultSet;
@@ -25,62 +24,54 @@ import com.datastax.driver.core.Row;
 import com.datastax.driver.mapping.Result;
 import com.datastax.driver.mapping.annotations.Accessor;
 import com.datastax.driver.mapping.annotations.Query;
-import org.openecomp.core.nosqldb.api.NoSqlDb;
-import org.openecomp.core.nosqldb.factory.NoSqlDbFactory;
-import org.openecomp.sdc.itempermissions.type.ItemPermissionsEntity;
-
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.Set;
+import org.openecomp.core.nosqldb.api.NoSqlDb;
+import org.openecomp.core.nosqldb.factory.NoSqlDbFactory;
+import org.openecomp.sdc.itempermissions.type.ItemPermissionsEntity;
 
 public class PermissionHandler {
 
-  private static NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface();
-  private static PermissionAccessor accessor =
-      noSqlDb.getMappingManager().createAccessor(PermissionAccessor.class);
-
-
-  public Optional<String> getItemUserPermission(String itemId, String user) {
-    ResultSet resultSet = accessor.getItemUserPermission(itemId, user);
-    Row row = resultSet.one();
-
-    if (Objects.nonNull(row)) {
-      return Optional.of(row.getString("permission"));
-    } else {
-      return Optional.empty();
+    private static NoSqlDb noSqlDb = NoSqlDbFactory.getInstance().createInterface();
+    private static PermissionAccessor accessor = noSqlDb.getMappingManager().createAccessor(PermissionAccessor.class);
+
+    public Optional<String> getItemUserPermission(String itemId, String user) {
+        ResultSet resultSet = accessor.getItemUserPermission(itemId, user);
+        Row row = resultSet.one();
+        if (Objects.nonNull(row)) {
+            return Optional.of(row.getString("permission"));
+        } else {
+            return Optional.empty();
+        }
     }
-  }
-
-  public void setItemUserPermission(String itemId, String user, String permission) {
-    accessor.setItemUserPermission(itemId, user, permission);
-  }
-
-  public void addItem(Set<String> items, String userId, String permission){
-    accessor.addItem(items,userId,permission);
-  }
-
-  public List<ItemPermissionsEntity> getAll(){
-    return accessor.getAll().all();
-  }
-
 
-  @Accessor
-  interface PermissionAccessor {
+    public void setItemUserPermission(String itemId, String user, String permission) {
+        accessor.setItemUserPermission(itemId, user, permission);
+    }
 
+    public void addItem(Set<String> items, String userId, String permission) {
+        accessor.addItem(items, userId, permission);
+    }
 
-    @Query("INSERT into dox.item_permissions (item_id,user_id,permission)  VALUES (?,?,?)")
-    void setItemUserPermission(String permission, String itemId, String userId);
+    public List<ItemPermissionsEntity> getAll() {
+        return accessor.getAll().all();
+    }
 
+    @Accessor
+    interface PermissionAccessor {
 
-    @Query("SELECT permission FROM dox.item_permissions WHERE item_id=? AND user_id=?")
-    ResultSet getItemUserPermission(String itemId, String userId);
+        @Query("INSERT into dox.item_permissions (item_id,user_id,permission)  VALUES (?,?,?)")
+        void setItemUserPermission(String permission, String itemId, String userId);
 
-    @Query("SELECT * from dox.item_permissions")
-    Result<ItemPermissionsEntity> getAll();
+        @Query("SELECT permission FROM dox.item_permissions WHERE item_id=? AND user_id=?")
+        ResultSet getItemUserPermission(String itemId, String userId);
 
-    @Query("update dox.user_permission_items set item_list=item_list+? WHERE user_id = ? AND permission = ?")
-    void addItem(Set<String> items, String userId, String permission);
-  }
+        @Query("SELECT * from dox.item_permissions")
+        Result<ItemPermissionsEntity> getAll();
 
+        @Query("update dox.user_permission_items set item_list=item_list+? WHERE user_id = ? AND permission = ?")
+        void addItem(Set<String> items, String userId, String permission);
+    }
 }