1 files changed, 63 insertions, 78 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/impl/ItemManagerImpl.java b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/impl/ItemManagerImpl.java
index 368eadad2c..8ef1fd2e04 100644
--- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/impl/ItemManagerImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/impl/ItemManagerImpl.java
@@ -13,9 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.openecomp.sdc.versioning.impl;
 
+import java.util.Collection;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
 import org.openecomp.sdc.common.errors.CoreException;
 import org.openecomp.sdc.common.errors.ErrorCategory;
 import org.openecomp.sdc.common.errors.ErrorCode;
@@ -25,98 +27,81 @@ import org.openecomp.sdc.versioning.dao.types.VersionStatus;
 import org.openecomp.sdc.versioning.types.Item;
 import org.openecomp.sdc.versioning.types.ItemStatus;
 
-import java.util.Collection;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
 public class ItemManagerImpl implements ItemManager {
 
-  private ItemDao itemDao;
-
-
-  public ItemManagerImpl(ItemDao itemDao) {
-    this.itemDao = itemDao;
-
-  }
+    private ItemDao itemDao;
 
-  @Override
-  public Collection<Item> list(Predicate<Item> predicate) {
-    return itemDao.list().stream().filter(predicate).collect(Collectors.toList());
-  }
-
-  @Override
-  public Item get(String itemId) {
-    Item item = new Item();
-    item.setId(itemId);
-    return itemDao.get(item);
-  }
-
-  @Override
-  public Item create(Item item) {
-    return itemDao.create(item);
-  }
-
-  @Override
-  public void updateVersionStatus(String itemId, VersionStatus addedVersionStatus,
-                                  VersionStatus removedVersionStatus) {
-    Item item = get(itemId);
-    if (item == null) {
-      return;
+    public ItemManagerImpl(ItemDao itemDao) {
+        this.itemDao = itemDao;
     }
 
-    item.addVersionStatus(addedVersionStatus);
-    if (removedVersionStatus != null) {
-      item.removeVersionStatus(removedVersionStatus);
+    @Override
+    public Collection<Item> list(Predicate<Item> predicate) {
+        return itemDao.list().stream().filter(predicate).collect(Collectors.toList());
     }
-    itemDao.update(item);
-  }
 
-  @Override
-  public void delete(Item item) {
-    itemDao.delete(item);
-  }
-
-  @Override
-  public void updateName(String itemId, String name) {
-    Item item = get(itemId);
-    if (item == null) {
-      return;
+    @Override
+    public Item get(String itemId) {
+        Item item = new Item();
+        item.setId(itemId);
+        return itemDao.get(item);
     }
 
-    item.setName(name);
-    itemDao.update(item);
-  }
-
-  @Override
-  public void archive(Item item) {
+    @Override
+    public Item create(Item item) {
+        return itemDao.create(item);
+    }
 
-    if (item.getStatus() == ItemStatus.ARCHIVED) {
-      throw new CoreException(new ErrorCode.ErrorCodeBuilder()
-          .withCategory(ErrorCategory.APPLICATION)
-          .withMessage(String.format("Archive item failed, item %s is already Archived", item.getId()))
-          .build());
+    @Override
+    public void updateVersionStatus(String itemId, VersionStatus addedVersionStatus, VersionStatus removedVersionStatus) {
+        Item item = get(itemId);
+        if (item == null) {
+            return;
+        }
+        item.addVersionStatus(addedVersionStatus);
+        if (removedVersionStatus != null) {
+            item.removeVersionStatus(removedVersionStatus);
+        }
+        itemDao.update(item);
     }
 
-    item.setStatus(ItemStatus.ARCHIVED);
-    itemDao.update(item);
-  }
+    @Override
+    public void delete(Item item) {
+        itemDao.delete(item);
+    }
 
-  @Override
-  public void restore(Item item) {
+    @Override
+    public void updateName(String itemId, String name) {
+        Item item = get(itemId);
+        if (item == null) {
+            return;
+        }
+        item.setName(name);
+        itemDao.update(item);
+    }
 
-      if (item.getStatus() == ItemStatus.ACTIVE) {
-          throw new CoreException(new ErrorCode.ErrorCodeBuilder()
-                  .withCategory(ErrorCategory.APPLICATION)
-                  .withMessage(String.format("Restore item failed, item %s is already Active", item.getId()))
-                  .build());
-      }
+    @Override
+    public void archive(Item item) {
+        if (item.getStatus() == ItemStatus.ARCHIVED) {
+            throw new CoreException(new ErrorCode.ErrorCodeBuilder().withCategory(ErrorCategory.APPLICATION)
+                .withMessage(String.format("Archive item failed, item %s is already Archived", item.getId())).build());
+        }
+        item.setStatus(ItemStatus.ARCHIVED);
+        itemDao.update(item);
+    }
 
-      item.setStatus(ItemStatus.ACTIVE);
-      itemDao.update(item);
+    @Override
+    public void restore(Item item) {
+        if (item.getStatus() == ItemStatus.ACTIVE) {
+            throw new CoreException(new ErrorCode.ErrorCodeBuilder().withCategory(ErrorCategory.APPLICATION)
+                .withMessage(String.format("Restore item failed, item %s is already Active", item.getId())).build());
+        }
+        item.setStatus(ItemStatus.ACTIVE);
+        itemDao.update(item);
     }
 
-  @Override
-  public void update(Item item) {
-    itemDao.update(item);
-  }
+    @Override
+    public void update(Item item) {
+        itemDao.update(item);
+    }
 }