5 files changed, 17 insertions, 24 deletions
diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/Action.java b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/Action.java
index 176d443a81..b7672644d2 100644
--- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/Action.java
+++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/Action.java
@@ -36,7 +36,6 @@ public class Action implements Comparable {
   private ActionStatus status;
   private String name;
   private String displayName;
-  private String endpointUri;
   private List<String> vendorList;
   private List<String> categoryList;
   private Date timestamp;
@@ -120,14 +119,6 @@ public class Action implements Comparable {
     this.displayName = displayName;
   }
 
-  public String getEndpointUri() {
-    return endpointUri;
-  }
-
-  public void setEndpointUri(String endpointUri) {
-    this.endpointUri = endpointUri;
-  }
-
   public List<String> getVendorList() {
     return vendorList;
   }
@@ -176,6 +167,7 @@ public class Action implements Comparable {
     this.supportedComponents = supportedComponents;
   }
 
+
   public List<ActionArtifact> getArtifacts() {
     return artifacts;
   }
@@ -213,8 +205,8 @@ public class Action implements Comparable {
     if (this.getStatus() != null) {
       destination.setStatus(this.getStatus().name());
     }
-    destination.setSupportedComponents(
-        getIdFromMap(this.getSupportedComponents(), ActionConstants.SUPPORTED_COMPONENTS_ID));
+    destination.setSupportedComponents(getIdFromMap(this.getSupportedComponents(),
+        ActionConstants.SUPPORTED_COMPONENTS_ID));
     destination.setSupportedModels(
         getIdFromMap(this.getSupportedModels(), ActionConstants.SUPPORTED_MODELS_VERSION_ID));
     destination.setData(this.getData());
@@ -224,11 +216,11 @@ public class Action implements Comparable {
   private List<String> getIdFromMap(List<HashMap<String, String>> map, String idName) {
     List<String> list = new ArrayList<>();
     if (map != null && !map.isEmpty()) {
-      map.forEach(entry -> {
+      for (HashMap<String, String> entry : map) {
         if (entry.containsKey(idName)) {
           list.add(entry.get(idName) != null ? entry.get(idName).toLowerCase() : null);
         }
-      });
+      }
       return list;
     }
     return null;
diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionArtifact.java b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionArtifact.java
index ef41673541..1c354e0f41 100644
--- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionArtifact.java
+++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionArtifact.java
@@ -26,6 +26,7 @@ import org.openecomp.sdc.action.dao.types.ActionArtifactEntity;
 import java.nio.ByteBuffer;
 import java.util.Date;
 
+
 public class ActionArtifact {
   private String artifactUuId;
 
diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionRequest.java b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionRequest.java
index 1a20f9ecb7..6ba70b08ee 100644
--- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionRequest.java
+++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionRequest.java
@@ -26,7 +26,7 @@ public enum ActionRequest {
   DELETE_ACTION,
   GET_FILTERED_ACTIONS,
   GET_ACTIONS_INVARIANT_ID,
-  GET_ECOMP_COMPONENTS,
+  GET_OPEN_ECOMP_COMPONENTS,
   ACTION_VERSIONING,
   CHECKOUT_ACTION,
   CHECKIN_ACTION,
diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionSubOperation.java b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionSubOperation.java
index 0dd97e6646..3298be7179 100644
--- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionSubOperation.java
+++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/ActionSubOperation.java
@@ -36,7 +36,7 @@ public enum ActionSubOperation {
   GET_ACTIONENTITY_BY_VERSION,
   GET_ALL_ACTIONS,
   GET_ACTIONINVID_BY_NAME,
-  GET_ECOMP_COMPONENTS_ENTITY,
+    GET_OPEN_ECOMP_COMPONENTS_ENTITY,
   GET_VERSIONINFO_FOR_ALL_ACTIONS,
   GET_NAME_BY_ACTIONINVID,
   CHECKOUT_ACTION,
diff --git a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/EcompComponent.java b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/OpenEcompComponent.java
index cbcebb13ef..bf3f0c54f9 100644
--- a/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/EcompComponent.java
+++ b/openecomp-be/lib/openecomp-sdc-action-lib/openecomp-sdc-action-api/src/main/java/org/openecomp/sdc/action/types/OpenEcompComponent.java
@@ -20,18 +20,18 @@
 
 package org.openecomp.sdc.action.types;
 
-import org.openecomp.sdc.action.dao.types.EcompComponentEntity;
+import org.openecomp.sdc.action.dao.types.OpenEcompComponentEntity;
 
-public class EcompComponent {
+public class OpenEcompComponent {
 
   private String id;
   private String name;
 
-  public EcompComponent() {
+  public OpenEcompComponent() {
     //Default constructor
   }
 
-  public EcompComponent(String name, String id) {
+  public OpenEcompComponent(String name, String id) {
     this.name = name;
     this.id = id;
   }
@@ -53,12 +53,12 @@ public class EcompComponent {
   }
 
   /**
-   * To entity ecomp component entity.
+   * To entity OPENECOMP component entity.
    *
-   * @return the ecomp component entity
+   * @return the OPENECOMP component entity
    */
-  public EcompComponentEntity toEntity() {
-    EcompComponentEntity destination = new EcompComponentEntity();
+  public OpenEcompComponentEntity toEntity() {
+    OpenEcompComponentEntity destination = new OpenEcompComponentEntity();
     destination.setId(this.getId());
     destination.setName(this.getName());
     return destination;
@@ -84,7 +84,7 @@ public class EcompComponent {
     if (this.getClass() != object.getClass()) {
       return false;
     }
-    EcompComponent obj = (EcompComponent) object;
+    OpenEcompComponent obj = (OpenEcompComponent) object;
     if (id == null) {
       if (obj.id != null) {
         return false;