1 files changed, 83 insertions, 97 deletions

diff --git a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImpl.java b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImpl.java
index b631663813..6ac18d9ff9 100644
--- a/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImpl.java
+++ b/openecomp-be/lib/openecomp-sdc-versioning-lib/openecomp-sdc-versioning-core/src/main/java/org/openecomp/sdc/versioning/dao/impl/zusammen/ItemZusammenDaoImpl.java
@@ -21,6 +21,9 @@ package org.openecomp.sdc.versioning.dao.impl.zusammen;
 
 import com.amdocs.zusammen.datatypes.Id;
 import com.amdocs.zusammen.datatypes.item.Info;
+import java.util.Collection;
+import java.util.Map;
+import java.util.stream.Collectors;
 import org.openecomp.core.zusammen.api.ZusammenAdaptor;
 import org.openecomp.core.zusammen.api.ZusammenUtil;
 import org.openecomp.sdc.versioning.dao.ItemDao;
@@ -28,120 +31,103 @@ 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.Map;
-import java.util.stream.Collectors;
-
 public class ItemZusammenDaoImpl implements ItemDao {
 
-  private ZusammenAdaptor zusammenAdaptor;
-
-  public ItemZusammenDaoImpl(ZusammenAdaptor zusammenAdaptor) {
-    this.zusammenAdaptor = zusammenAdaptor;
-  }
-
-  @Override
-  public Collection<Item> list() {
-    return zusammenAdaptor.listItems(ZusammenUtil.createSessionContext())
-        .stream().map(this::mapFromZusammenItem)
-        .collect(Collectors.toList());
-  }
-
-  @Override
-  public Item get(Item item) {
-    return mapFromZusammenItem(
-        zusammenAdaptor.getItem(ZusammenUtil.createSessionContext(), new Id(item.getId())));
-  }
-
-  @Override
-  public Item create(Item item) {
-    Id itemId = zusammenAdaptor
-        .createItem(ZusammenUtil.createSessionContext(), mapToZusammenItemInfo(item));
-    item.setId(itemId.getValue());
-    return item;
-  }
+    private ZusammenAdaptor zusammenAdaptor;
 
-  @Override
-  public void delete(Item item){
-    zusammenAdaptor.deleteItem(ZusammenUtil.createSessionContext(),new Id(item.getId()));
-  }
+    public ItemZusammenDaoImpl(ZusammenAdaptor zusammenAdaptor) {
+        this.zusammenAdaptor = zusammenAdaptor;
+    }
 
-  @Override
-  public void update(Item item) {
-    zusammenAdaptor
-        .updateItem(ZusammenUtil.createSessionContext(), new Id(item.getId()),
-            mapToZusammenItemInfo(item));
-  }
+    @Override
+    public Collection<Item> list() {
+        return zusammenAdaptor.listItems(ZusammenUtil.createSessionContext()).stream().map(this::mapFromZusammenItem).collect(Collectors.toList());
+    }
 
-  private Item mapFromZusammenItem(com.amdocs.zusammen.datatypes.item.Item zusammenItem) {
-    if (zusammenItem == null) {
-      return null;
+    @Override
+    public Item get(Item item) {
+        return mapFromZusammenItem(zusammenAdaptor.getItem(ZusammenUtil.createSessionContext(), new Id(item.getId())));
     }
-    Item item = new Item();
-    item.setId(zusammenItem.getId().getValue());
-    item.setName(zusammenItem.getInfo().getName());
-    item.setDescription(zusammenItem.getInfo().getDescription());
 
-    zusammenItem.getInfo().getProperties().entrySet()
-        .forEach(property -> addPropertyToItem(property.getKey(), property.getValue(), item));
+    @Override
+    public Item create(Item item) {
+        Id itemId = zusammenAdaptor.createItem(ZusammenUtil.createSessionContext(), mapToZusammenItemInfo(item));
+        item.setId(itemId.getValue());
+        return item;
+    }
 
-    item.setCreationTime(zusammenItem.getCreationTime());
-    item.setModificationTime(zusammenItem.getModificationTime());
+    @Override
+    public void delete(Item item) {
+        zusammenAdaptor.deleteItem(ZusammenUtil.createSessionContext(), new Id(item.getId()));
+    }
 
-    if(item.getStatus() == null){
-      item.setStatus(ItemStatus.ACTIVE);
-      update(item);
+    @Override
+    public void update(Item item) {
+        zusammenAdaptor.updateItem(ZusammenUtil.createSessionContext(), new Id(item.getId()), mapToZusammenItemInfo(item));
     }
 
-    return item;
-  }
+    private Item mapFromZusammenItem(com.amdocs.zusammen.datatypes.item.Item zusammenItem) {
+        if (zusammenItem == null) {
+            return null;
+        }
+        Item item = new Item();
+        item.setId(zusammenItem.getId().getValue());
+        item.setName(zusammenItem.getInfo().getName());
+        item.setDescription(zusammenItem.getInfo().getDescription());
+        zusammenItem.getInfo().getProperties().entrySet().forEach(property -> addPropertyToItem(property.getKey(), property.getValue(), item));
+        item.setCreationTime(zusammenItem.getCreationTime());
+        item.setModificationTime(zusammenItem.getModificationTime());
+        if (item.getStatus() == null) {
+            item.setStatus(ItemStatus.ACTIVE);
+            update(item);
+        }
+        return item;
+    }
 
-  private void addPropertyToItem(String propertyKey, Object propertyValue, Item item) {
-    switch (propertyKey) {
-      case InfoPropertyName.ITEM_TYPE:
-        item.setType((String) propertyValue);
-        break;
-      case InfoPropertyName.ITEM_OWNER:
-        item.setOwner((String) propertyValue);
-        break;
-      case InfoPropertyName.ITEM_STATUS:
-        item.setStatus(ItemStatus.valueOf((String)propertyValue));
-        break;
-      case InfoPropertyName.ITEM_VERSIONS_STATUSES:
-        for (Map.Entry<String, Number> statusCounter :
-            ((Map<String, Number>) propertyValue).entrySet()) {
-          item.getVersionStatusCounters().put(VersionStatus.valueOf(statusCounter.getKey()),
-              statusCounter.getValue().intValue());
+    private void addPropertyToItem(String propertyKey, Object propertyValue, Item item) {
+        switch (propertyKey) {
+            case InfoPropertyName.ITEM_TYPE:
+                item.setType((String) propertyValue);
+                break;
+            case InfoPropertyName.ITEM_OWNER:
+                item.setOwner((String) propertyValue);
+                break;
+            case InfoPropertyName.ITEM_STATUS:
+                item.setStatus(ItemStatus.valueOf((String) propertyValue));
+                break;
+            case InfoPropertyName.ITEM_VERSIONS_STATUSES:
+                for (Map.Entry<String, Number> statusCounter : ((Map<String, Number>) propertyValue).entrySet()) {
+                    item.getVersionStatusCounters().put(VersionStatus.valueOf(statusCounter.getKey()), statusCounter.getValue().intValue());
+                }
+                break;
+            default:
+                item.addProperty(propertyKey, propertyValue);
         }
-        break;
-      default:
-        item.addProperty(propertyKey, propertyValue);
     }
-  }
 
-  private Info mapToZusammenItemInfo(Item item) {
-    Info info = new Info();
-    info.setName(item.getName());
-    info.setDescription(item.getDescription());
-    info.addProperty(InfoPropertyName.ITEM_TYPE, item.getType());
-    info.addProperty(InfoPropertyName.ITEM_OWNER,item.getOwner());
-    if (item.getStatus() != null) {
-      info.addProperty(InfoPropertyName.ITEM_STATUS, item.getStatus());
+    private Info mapToZusammenItemInfo(Item item) {
+        Info info = new Info();
+        info.setName(item.getName());
+        info.setDescription(item.getDescription());
+        info.addProperty(InfoPropertyName.ITEM_TYPE, item.getType());
+        info.addProperty(InfoPropertyName.ITEM_OWNER, item.getOwner());
+        if (item.getStatus() != null) {
+            info.addProperty(InfoPropertyName.ITEM_STATUS, item.getStatus());
+        }
+        info.addProperty(InfoPropertyName.ITEM_VERSIONS_STATUSES, item.getVersionStatusCounters());
+        item.getProperties().entrySet().forEach(property -> info.addProperty(property.getKey(), property.getValue()));
+        return info;
     }
-    info.addProperty(InfoPropertyName.ITEM_VERSIONS_STATUSES, item.getVersionStatusCounters());
-    item.getProperties().entrySet()
-        .forEach(property -> info.addProperty(property.getKey(), property.getValue()));
-    return info;
-  }
 
-  private static final class InfoPropertyName {
-    private static final String ITEM_TYPE = "item_type";
-    private static final String ITEM_VERSIONS_STATUSES = "item_versions_statuses";
-    private static final String ITEM_OWNER = "Owner";
-    private static final String ITEM_STATUS = "status";
+    private static final class InfoPropertyName {
 
-    private InfoPropertyName() {
-      throw new IllegalStateException("Constants class");
+        private static final String ITEM_TYPE = "item_type";
+        private static final String ITEM_VERSIONS_STATUSES = "item_versions_statuses";
+        private static final String ITEM_OWNER = "Owner";
+        private static final String ITEM_STATUS = "status";
+
+        private InfoPropertyName() {
+            throw new IllegalStateException("Constants class");
+        }
     }
-  }
 }