Support for concat TOSCA function

[sdc.git] / catalog-be / src / main / java / org / openecomp / sdc / be / impl / ComponentsUtils.java

diff --git a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java
index 7ac2089..7d58687 100644 (file)
--- a/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java
+++ b/catalog-be/src/main/java/org/openecomp/sdc/be/impl/ComponentsUtils.java
@@ -19,7 +19,6 @@
  * Modifications copyright (c) 2019 Nokia
  * ================================================================================
  */
  * Modifications copyright (c) 2019 Nokia
  * ================================================================================
  */

-

 package org.openecomp.sdc.be.impl;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;
 package org.openecomp.sdc.be.impl;
 
 import com.fasterxml.jackson.databind.DeserializationFeature;


@@ -76,12 +75,16 @@ import org.openecomp.sdc.be.components.impl.exceptions.ByActionStatusComponentEx
 import org.openecomp.sdc.be.components.impl.exceptions.ByResponseFormatComponentException;
 import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;
 import org.openecomp.sdc.be.components.impl.exceptions.ByResponseFormatComponentException;
 import org.openecomp.sdc.be.components.impl.exceptions.ComponentException;
 import org.openecomp.sdc.be.config.BeEcompErrorManager;

+import org.openecomp.sdc.be.config.BeEcompErrorManager.ErrorSeverity;

 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus;
 import org.openecomp.sdc.be.dao.graph.datatype.AdditionalInformationEnum;
 import org.openecomp.sdc.be.dao.api.ActionStatus;
 import org.openecomp.sdc.be.dao.cassandra.CassandraOperationStatus;
 import org.openecomp.sdc.be.dao.graph.datatype.AdditionalInformationEnum;

+import org.openecomp.sdc.be.dao.janusgraph.JanusGraphOperationStatus;

 import org.openecomp.sdc.be.datamodel.utils.ConstraintConvertor;
 import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterInfo;
 import org.openecomp.sdc.be.datatypes.elements.RequirementNodeFilterPropertyDataDefinition;
 import org.openecomp.sdc.be.datamodel.utils.ConstraintConvertor;
 import org.openecomp.sdc.be.datatypes.elements.AdditionalInfoParameterInfo;
 import org.openecomp.sdc.be.datatypes.elements.RequirementNodeFilterPropertyDataDefinition;

+import org.openecomp.sdc.be.datatypes.elements.ToscaFunction;
+import org.openecomp.sdc.be.datatypes.elements.ToscaFunctionJsonDeserializer;

 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.ComponentTypeEnum;
 import org.openecomp.sdc.be.datatypes.enums.JsonPresentationFields;
 import org.openecomp.sdc.be.datatypes.enums.NodeTypeEnum;


@@ -98,6 +101,7 @@ import org.openecomp.sdc.be.model.PropertyConstraint;
 import org.openecomp.sdc.be.model.RequirementDefinition;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;
 import org.openecomp.sdc.be.model.RequirementDefinition;
 import org.openecomp.sdc.be.model.Resource;
 import org.openecomp.sdc.be.model.User;

+import org.openecomp.sdc.be.model.cache.ApplicationDataTypeCache;

 import org.openecomp.sdc.be.model.operations.StorageException;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation.PropertyConstraintDeserialiser;
 import org.openecomp.sdc.be.model.operations.StorageException;
 import org.openecomp.sdc.be.model.operations.api.StorageOperationStatus;
 import org.openecomp.sdc.be.model.operations.impl.PropertyOperation.PropertyConstraintDeserialiser;


@@ -134,9 +138,9 @@ public class ComponentsUtils {
     private static final String CONVERT_JSON_TO_OBJECT = "convertJsonToObject";
     private static final Logger log = Logger.getLogger(ComponentsUtils.class);
     private static final String PARTNER_NAME = "UNKNOWN";
     private static final String CONVERT_JSON_TO_OBJECT = "convertJsonToObject";
     private static final Logger log = Logger.getLogger(ComponentsUtils.class);
     private static final String PARTNER_NAME = "UNKNOWN";

+    private static LoggerSdcAudit audit = new LoggerSdcAudit(DmaapConsumer.class);

     private final AuditingManager auditingManager;
     private final ResponseFormatManager responseFormatManager;
     private final AuditingManager auditingManager;
     private final ResponseFormatManager responseFormatManager;

-    private static LoggerSdcAudit audit = new LoggerSdcAudit(DmaapConsumer.class);

 
     @Autowired
     public ComponentsUtils(AuditingManager auditingManager) {
 
     @Autowired
     public ComponentsUtils(AuditingManager auditingManager) {


@@ -144,6 +148,55 @@ public class ComponentsUtils {
         this.responseFormatManager = ResponseFormatManager.getInstance();
     }
 
         this.responseFormatManager = ResponseFormatManager.getInstance();
     }
 

+    public static <T> T parseJsonToObject(String data, Class<T> clazz) {
+        Type constraintType = new TypeToken<PropertyConstraint>() {
+        }.getType();
+        Gson gson = new GsonBuilder().registerTypeAdapter(constraintType, new PropertyConstraintDeserialiser()).create();
+        log.trace("convert json to object. json=\n{}", data);
+        return gson.fromJson(data, clazz);
+    }
+
+    private static Set<String> getNodesFiltersToBeDeleted(final Component component, final String componentInstanceName) {
+        return component.getComponentInstances().stream().filter(ci -> isNodeFilterUsingChangedCi(ci, componentInstanceName))
+            .map(ComponentInstance::getName).collect(Collectors.toSet());
+    }
+
+    public static Set<String> getNodesFiltersToBeDeleted(final Component component, final ComponentInstance componentInstance) {
+        return getNodesFiltersToBeDeleted(component, componentInstance.getName());
+    }
+
+    private static boolean isNodeFilterUsingChangedCi(final ComponentInstance componentInstance, final String componentInstanceName) {
+        if (CollectionUtils.isEmpty(componentInstance.getDirectives())) {
+            return false;
+        }
+        if (componentInstance.getNodeFilter() == null || componentInstance.getNodeFilter().getProperties() == null
+            || componentInstance.getNodeFilter().getProperties().getListToscaDataDefinition() == null) {
+            return false;
+        }
+        return componentInstance.getNodeFilter().getProperties().getListToscaDataDefinition().stream()
+            .anyMatch(property -> isPropertyConstraintChangedByCi(property, componentInstanceName));
+    }
+
+    private static boolean isPropertyConstraintChangedByCi(
+        final RequirementNodeFilterPropertyDataDefinition requirementNodeFilterPropertyDataDefinition, final String componentInstanceName) {
+        final List<String> constraints = requirementNodeFilterPropertyDataDefinition.getConstraints();
+        if (constraints == null) {
+            return false;
+        }
+        return constraints.stream().anyMatch(constraint -> isConstraintChangedByCi(constraint, componentInstanceName));
+    }
+
+    private static boolean isConstraintChangedByCi(final String constraint, final String componentInstanceName) {
+        final UIConstraint uiConstraint = new ConstraintConvertor().convert(constraint);
+        if (uiConstraint == null || uiConstraint.getSourceType() == null) {
+            return false;
+        }
+        if (!uiConstraint.getSourceType().equals(ConstraintConvertor.PROPERTY_CONSTRAINT)) {
+            return false;
+        }
+        return uiConstraint.getSourceName().equals(componentInstanceName);
+    }
+

     public AuditingManager getAuditingManager() {
         return auditingManager;
     }
     public AuditingManager getAuditingManager() {
         return auditingManager;
     }


@@ -167,26 +220,18 @@ public class ComponentsUtils {
         }
     }
 
         }
     }
 

-    public static <T> T parseJsonToObject(String data, Class<T> clazz) {
-        Type constraintType = new TypeToken<PropertyConstraint>() {}.getType();
-        Gson gson = new GsonBuilder().registerTypeAdapter(constraintType, new PropertyConstraintDeserialiser()).create();
-        log.trace("convert json to object. json=\n{}", data);
-        return gson.fromJson(data, clazz);
-    }
-
-    public <T> Either<T, ResponseFormat> convertJsonToObjectUsingObjectMapper(String data, User user, Class<T> clazz, AuditingActionEnum actionEnum, ComponentTypeEnum typeEnum) {
+    public <T> Either<T, ResponseFormat> convertJsonToObjectUsingObjectMapper(String data, User user, Class<T> clazz, AuditingActionEnum actionEnum,
+                                                                              ComponentTypeEnum typeEnum) {

         T component;
         ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
         mapper.configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true);
         T component;
         ObjectMapper mapper = new ObjectMapper().configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
         mapper.configure(DeserializationFeature.ACCEPT_SINGLE_VALUE_AS_ARRAY, true);
         mapper.configure(DeserializationFeature.READ_UNKNOWN_ENUM_VALUES_AS_NULL, true);

-

         try {
             log.trace("convert json to object. json=\n{}", data);
         try {
             log.trace("convert json to object. json=\n{}", data);

-

             SimpleModule module = new SimpleModule("customDeserializationModule");
             module.addDeserializer(PropertyConstraint.class, new PropertyConstraintJacksonDeserializer());
             SimpleModule module = new SimpleModule("customDeserializationModule");
             module.addDeserializer(PropertyConstraint.class, new PropertyConstraintJacksonDeserializer());

+            module.addDeserializer(ToscaFunction.class, new ToscaFunctionJsonDeserializer());

             mapper.registerModule(module);
             mapper.registerModule(module);

-

             component = mapper.readValue(data, clazz);
             if (component == null) {
                 BeEcompErrorManager.getInstance().logBeInvalidJsonInput(CONVERT_JSON_TO_OBJECT);
             component = mapper.readValue(data, clazz);
             if (component == null) {
                 BeEcompErrorManager.getInstance().logBeInvalidJsonInput(CONVERT_JSON_TO_OBJECT);


@@ -212,15 +257,17 @@ public class ComponentsUtils {
     }
 
     public <T> Either<List<T>, ResponseFormat> convertToResponseFormatOrNotFoundErrorToEmptyList(StorageOperationStatus storageOperationStatus) {
     }
 
     public <T> Either<List<T>, ResponseFormat> convertToResponseFormatOrNotFoundErrorToEmptyList(StorageOperationStatus storageOperationStatus) {

-        return storageOperationStatus.equals(StorageOperationStatus.NOT_FOUND) ? Either.left(Collections.emptyList()) :
-                Either.right(getResponseFormat(storageOperationStatus));
+        return storageOperationStatus.equals(StorageOperationStatus.NOT_FOUND) ? Either.left(Collections.emptyList())
+            : Either.right(getResponseFormat(storageOperationStatus));

     }
 
     /**
     }
 
     /**

-     * Returns the response format of resource error with respective variables according to actionStatus. This is needed for cases where actionStatus is anonymously converted from storage operation, and the caller doesn't know what actionStatus he
-     * received. It's caller's Responsibility to fill the resource object passed to this function with needed fields.
+     * Returns the response format of resource error with respective variables according to actionStatus. This is needed for cases where actionStatus
+     * is anonymously converted from storage operation, and the caller doesn't know what actionStatus he received. It's caller's Responsibility to
+     * fill the resource object passed to this function with needed fields.

      * <p>
      * <p>

-     * Note that RESOURCE_IN_USE case passes hardcoded "resource" string to the error parameter. This means that if Resource object will also be used for Service, this code needs to be refactored and we should tell Resource from Service.
+     * Note that RESOURCE_IN_USE case passes hardcoded "resource" string to the error parameter. This means that if Resource object will also be used
+     * for Service, this code needs to be refactored and we should tell Resource from Service.

      *
      * @param actionStatus
      * @param resource
      *
      * @param actionStatus
      * @param resource


@@ -231,19 +278,21 @@ public class ComponentsUtils {
             return getResponseFormat(actionStatus);
         }
         ResponseFormat responseFormat;
             return getResponseFormat(actionStatus);
         }
         ResponseFormat responseFormat;

-

         switch (actionStatus) {
             case COMPONENT_VERSION_ALREADY_EXIST:
         switch (actionStatus) {
             case COMPONENT_VERSION_ALREADY_EXIST:

-                responseFormat = getResponseFormat(ActionStatus.COMPONENT_VERSION_ALREADY_EXIST, ComponentTypeEnum.RESOURCE.getValue(), resource.getVersion());
+                responseFormat = getResponseFormat(ActionStatus.COMPONENT_VERSION_ALREADY_EXIST, ComponentTypeEnum.RESOURCE.getValue(),
+                    resource.getVersion());

                 break;
             case RESOURCE_NOT_FOUND:
                 responseFormat = getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resource.getName());
                 break;
             case COMPONENT_NAME_ALREADY_EXIST:
                 break;
             case RESOURCE_NOT_FOUND:
                 responseFormat = getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resource.getName());
                 break;
             case COMPONENT_NAME_ALREADY_EXIST:

-                responseFormat = getResponseFormat(ActionStatus.COMPONENT_NAME_ALREADY_EXIST, ComponentTypeEnum.RESOURCE.getValue(), resource.getName());
+                responseFormat = getResponseFormat(ActionStatus.COMPONENT_NAME_ALREADY_EXIST, ComponentTypeEnum.RESOURCE.getValue(),
+                    resource.getName());

                 break;
             case COMPONENT_IN_USE:
                 break;
             case COMPONENT_IN_USE:

-                responseFormat = getResponseFormat(ActionStatus.COMPONENT_IN_USE, ComponentTypeEnum.RESOURCE.name().toLowerCase(), resource.getUniqueId());
+                responseFormat = getResponseFormat(ActionStatus.COMPONENT_IN_USE, ComponentTypeEnum.RESOURCE.name().toLowerCase(),
+                    resource.getUniqueId());

                 break;
             default:
                 responseFormat = getResponseFormat(actionStatus);
                 break;
             default:
                 responseFormat = getResponseFormat(actionStatus);


@@ -256,12 +305,10 @@ public class ComponentsUtils {
         if (resourceName == null) {
             return getResponseFormat(actionStatus);
         }
         if (resourceName == null) {
             return getResponseFormat(actionStatus);
         }

-

         ResponseFormat responseFormat;
         if (actionStatus == ActionStatus.RESOURCE_NOT_FOUND) {
             responseFormat = getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceName);
         ResponseFormat responseFormat;
         if (actionStatus == ActionStatus.RESOURCE_NOT_FOUND) {
             responseFormat = getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, resourceName);

-        }
-        else {
+        } else {

             responseFormat = getResponseFormat(actionStatus);
         }
         return responseFormat;
             responseFormat = getResponseFormat(actionStatus);
         }
         return responseFormat;


@@ -271,12 +318,10 @@ public class ComponentsUtils {
         if (capabilityType == null) {
             return getResponseFormat(actionStatus);
         }
         if (capabilityType == null) {
             return getResponseFormat(actionStatus);
         }

-

         ResponseFormat responseFormat;
         if (actionStatus == ActionStatus.CAPABILITY_TYPE_ALREADY_EXIST) {
             responseFormat = getResponseFormat(ActionStatus.CAPABILITY_TYPE_ALREADY_EXIST, capabilityType.getType());
         ResponseFormat responseFormat;
         if (actionStatus == ActionStatus.CAPABILITY_TYPE_ALREADY_EXIST) {
             responseFormat = getResponseFormat(ActionStatus.CAPABILITY_TYPE_ALREADY_EXIST, capabilityType.getType());

-        }
-        else {
+        } else {

             responseFormat = getResponseFormat(actionStatus);
         }
         return responseFormat;
             responseFormat = getResponseFormat(actionStatus);
         }
         return responseFormat;


@@ -286,28 +331,27 @@ public class ComponentsUtils {
         if (obj == null) {
             return getResponseFormat(actionStatus);
         }
         if (obj == null) {
             return getResponseFormat(actionStatus);
         }

-

         ResponseFormat responseFormat = null;
         if (actionStatus == ActionStatus.MISSING_CAPABILITY_TYPE) {
             if (obj instanceof List && org.apache.commons.collections.CollectionUtils.isNotEmpty((List) obj)) {
                 List list = (List) obj;
                 if (list.get(0) instanceof RequirementDefinition) {
                     responseFormat = getResponseFormat(ActionStatus.MISSING_CAPABILITY_TYPE, ((RequirementDefinition) list
         ResponseFormat responseFormat = null;
         if (actionStatus == ActionStatus.MISSING_CAPABILITY_TYPE) {
             if (obj instanceof List && org.apache.commons.collections.CollectionUtils.isNotEmpty((List) obj)) {
                 List list = (List) obj;
                 if (list.get(0) instanceof RequirementDefinition) {
                     responseFormat = getResponseFormat(ActionStatus.MISSING_CAPABILITY_TYPE, ((RequirementDefinition) list

-                            .get(0)).getName());    //Arbitray index, all we need is single object
+                        .get(0)).getName());    //Arbitray index, all we need is single object

                     return responseFormat;
                 }
             }
             log.debug("UNKNOWN TYPE : expecting obj as a non empty List<RequirmentsDefinitions>");
                     return responseFormat;
                 }
             }
             log.debug("UNKNOWN TYPE : expecting obj as a non empty List<RequirmentsDefinitions>");

-        }
-        else {
+        } else {

             responseFormat = getResponseFormat(actionStatus);
         }
         return responseFormat;
     }
 
     /**
             responseFormat = getResponseFormat(actionStatus);
         }
         return responseFormat;
     }
 
     /**

-     * Returns the response format of resource error with respective variables according to actionStatus. This is needed for cases where actionStatus is anynomously converted from storage operation, and the caller doesn't know what actionStatus he
-     * received. It's caller's responisibility to fill the passed resource object with needed fields.
+     * Returns the response format of resource error with respective variables according to actionStatus. This is needed for cases where actionStatus
+     * is anynomously converted from storage operation, and the caller doesn't know what actionStatus he received. It's caller's responisibility to
+     * fill the passed resource object with needed fields.

      *
      * @param actionStatus
      * @param user
      *
      * @param actionStatus
      * @param user


@@ -349,7 +393,6 @@ public class ComponentsUtils {
 
     public ResponseFormat getResponseFormatByDE(ActionStatus actionStatus, String envName) {
         ResponseFormat responseFormat;
 
     public ResponseFormat getResponseFormatByDE(ActionStatus actionStatus, String envName) {
         ResponseFormat responseFormat;

-

         switch (actionStatus) {
             case DISTRIBUTION_ENVIRONMENT_NOT_AVAILABLE:
                 responseFormat = getResponseFormat(ActionStatus.DISTRIBUTION_ENVIRONMENT_NOT_AVAILABLE, envName);
         switch (actionStatus) {
             case DISTRIBUTION_ENVIRONMENT_NOT_AVAILABLE:
                 responseFormat = getResponseFormat(ActionStatus.DISTRIBUTION_ENVIRONMENT_NOT_AVAILABLE, envName);


@@ -364,13 +407,15 @@ public class ComponentsUtils {
         return responseFormat;
     }
 
         return responseFormat;
     }
 

-    public ResponseFormat getResponseFormatByArtifactId(ActionStatus actionStatus, String artifactId) {
+    public ResponseFormat getResponseFormatByArtifactId(ActionStatus actionStatus, String... params) {

         ResponseFormat responseFormat;
         ResponseFormat responseFormat;

-

         switch (actionStatus) {
             case RESOURCE_NOT_FOUND:
             case ARTIFACT_NOT_FOUND:
         switch (actionStatus) {
             case RESOURCE_NOT_FOUND:
             case ARTIFACT_NOT_FOUND:

-                responseFormat = getResponseFormat(ActionStatus.ARTIFACT_NOT_FOUND, artifactId);
+                responseFormat = getResponseFormat(ActionStatus.ARTIFACT_NOT_FOUND, params);
+                break;
+            case ARTIFACT_NAME_INVALID:
+                responseFormat = getResponseFormat(ActionStatus.ARTIFACT_NAME_INVALID, params);

                 break;
             default:
                 responseFormat = getResponseFormat(actionStatus);
                 break;
             default:
                 responseFormat = getResponseFormat(actionStatus);


@@ -393,8 +438,6 @@ public class ComponentsUtils {
         return responseFormat;
     }
 
         return responseFormat;
     }
 

-
-

     public ResponseFormat getInvalidContentErrorForConsumerAndAudit(User user, ConsumerDefinition consumer, AuditingActionEnum actionEnum) {
         ResponseFormat responseFormat = responseFormatManager.getResponseFormat(ActionStatus.INVALID_CONTENT);
         log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
     public ResponseFormat getInvalidContentErrorForConsumerAndAudit(User user, ConsumerDefinition consumer, AuditingActionEnum actionEnum) {
         ResponseFormat responseFormat = responseFormatManager.getResponseFormat(ActionStatus.INVALID_CONTENT);
         log.debug(AUDIT_BEFORE_SENDING_RESPONSE);


@@ -405,11 +448,12 @@ public class ComponentsUtils {
     private ResponseFormat getInvalidContentErrorAndAuditComponent(User user, AuditingActionEnum actionEnum, ComponentTypeEnum typeEnum) {
         ResponseFormat responseFormat = responseFormatManager.getResponseFormat(ActionStatus.INVALID_CONTENT);
         log.debug(AUDIT_BEFORE_SENDING_RESPONSE);
     private ResponseFormat getInvalidContentErrorAndAuditComponent(User user, AuditingActionEnum actionEnum, ComponentTypeEnum typeEnum) {
         ResponseFormat responseFormat = responseFormatManager.getResponseFormat(ActionStatus.INVALID_CONTENT);
         log.debug(AUDIT_BEFORE_SENDING_RESPONSE);

-        auditComponentAdmin(responseFormat, user, null,  actionEnum, typeEnum);
+        auditComponentAdmin(responseFormat, user, null, actionEnum, typeEnum);

         return responseFormat;
     }
 
         return responseFormat;
     }
 

-    public void auditResource(ResponseFormat responseFormat, User modifier, Resource resource, AuditingActionEnum actionEnum, ResourceVersionInfo prevResFields) {
+    public void auditResource(ResponseFormat responseFormat, User modifier, Resource resource, AuditingActionEnum actionEnum,
+                              ResourceVersionInfo prevResFields) {

         auditResource(responseFormat, modifier, resource, resource.getName(), actionEnum, prevResFields, null, null);
     }
 
         auditResource(responseFormat, modifier, resource, resource.getName(), actionEnum, prevResFields, null, null);
     }
 


@@ -429,20 +473,15 @@ public class ComponentsUtils {
                               ResourceVersionInfo prevResFields, String currentArtifactUuid, ArtifactDefinition artifactDefinition) {
         if (actionEnum != null) {
             int status = responseFormat.getStatus();
                               ResourceVersionInfo prevResFields, String currentArtifactUuid, ArtifactDefinition artifactDefinition) {
         if (actionEnum != null) {
             int status = responseFormat.getStatus();

-

             String uuid = null;
             String resourceCurrVersion = null;
             String resourceCurrState = null;
             String invariantUUID = null;
             String resourceType = ComponentTypeEnum.RESOURCE.getValue();
             String toscaNodeType = null;
             String uuid = null;
             String resourceCurrVersion = null;
             String resourceCurrState = null;
             String invariantUUID = null;
             String resourceType = ComponentTypeEnum.RESOURCE.getValue();
             String toscaNodeType = null;

-

             log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);
             log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);

-

             String message = getMessageString(responseFormat);
             String message = getMessageString(responseFormat);

-

             String artifactData = buildAuditingArtifactData(artifactDefinition);
             String artifactData = buildAuditingArtifactData(artifactDefinition);

-

             if (resource != null) {
                 resourceName = resource.getName();
                 resourceCurrVersion = resource.getVersion();
             if (resource != null) {
                 resourceName = resource.getName();
                 resourceCurrVersion = resource.getVersion();


@@ -452,30 +491,15 @@ public class ComponentsUtils {
                 if (resource.getResourceType() != null) {
                     resourceType = resource.getResourceType().name();
                 }
                 if (resource.getResourceType() != null) {
                     resourceType = resource.getResourceType().name();
                 }

-                invariantUUID =  resource.getInvariantUUID();
-                uuid =  resource.getUUID();
+                invariantUUID = resource.getInvariantUUID();
+                uuid = resource.getUUID();

                 toscaNodeType = resource.getToscaResourceName();
             }
                 toscaNodeType = resource.getToscaResourceName();
             }

-
-            AuditEventFactory factory = AuditResourceEventFactoryManager.createResourceEventFactory(
-                    actionEnum,
-                    CommonAuditData.newBuilder()
-                            .status(status)
-                            .description(message)
-                            .requestId(ThreadLocalsHolder.getUuid())
-                            .serviceInstanceId(uuid)
-                            .build(),
-                    new ResourceCommonInfo(resourceName, resourceType),
-                    prevResFields,
-                    ResourceVersionInfo.newBuilder()
-                            .artifactUuid(currentArtifactUuid)
-                            .state(resourceCurrState)
-                            .version(resourceCurrVersion)
-                            .build(),
-                    invariantUUID,
-                    modifier,
-                    artifactData, null, null, toscaNodeType);
-
+            AuditEventFactory factory = AuditResourceEventFactoryManager.createResourceEventFactory(actionEnum,
+                CommonAuditData.newBuilder().status(status).description(message).requestId(ThreadLocalsHolder.getUuid()).serviceInstanceId(uuid)
+                    .build(), new ResourceCommonInfo(resourceName, resourceType), prevResFields,
+                ResourceVersionInfo.newBuilder().artifactUuid(currentArtifactUuid).state(resourceCurrState).version(resourceCurrVersion).build(),
+                invariantUUID, modifier, artifactData, null, null, toscaNodeType);

             getAuditingManager().auditEvent(factory);
         }
     }
             getAuditingManager().auditEvent(factory);
         }
     }


@@ -492,260 +516,163 @@ public class ComponentsUtils {
     public void auditDistributionDownload(ResponseFormat responseFormat, DistributionData distributionData) {
         log.trace("Inside auditing");
         int status = responseFormat.getStatus();
     public void auditDistributionDownload(ResponseFormat responseFormat, DistributionData distributionData) {
         log.trace("Inside auditing");
         int status = responseFormat.getStatus();

-

         String message = getMessageString(responseFormat);
         String message = getMessageString(responseFormat);

-

         AuditDistributionDownloadEventFactory factory = new AuditDistributionDownloadEventFactory(
         AuditDistributionDownloadEventFactory factory = new AuditDistributionDownloadEventFactory(

-                CommonAuditData.newBuilder()
-                        .status(status)
-                        .description(message)
-                        .requestId(ThreadLocalsHolder.getUuid())
-                        .build(),
-                distributionData);
+            CommonAuditData.newBuilder().status(status).description(message).requestId(ThreadLocalsHolder.getUuid()).build(), distributionData);

         getAuditingManager().auditEvent(factory);
     }
 
     public void auditExternalGetAsset(ResponseFormat responseFormat, AuditingActionEnum actionEnum, DistributionData distributionData,
                                       ResourceCommonInfo resourceCommonInfo, String requestId, String serviceInstanceId) {
         log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);
         getAuditingManager().auditEvent(factory);
     }
 
     public void auditExternalGetAsset(ResponseFormat responseFormat, AuditingActionEnum actionEnum, DistributionData distributionData,
                                       ResourceCommonInfo resourceCommonInfo, String requestId, String serviceInstanceId) {
         log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);

-

         AuditEventFactory factory = new AuditAssetExternalApiEventFactory(actionEnum,
         AuditEventFactory factory = new AuditAssetExternalApiEventFactory(actionEnum,

-                CommonAuditData.newBuilder()
-                        .status(responseFormat.getStatus())
-                        .description(getMessageString(responseFormat))
-                        .requestId(requestId)
-                        .serviceInstanceId(serviceInstanceId)
-                        .build(),
-                resourceCommonInfo, distributionData);
-
+            CommonAuditData.newBuilder().status(responseFormat.getStatus()).description(getMessageString(responseFormat)).requestId(requestId)
+                .serviceInstanceId(serviceInstanceId).build(), resourceCommonInfo, distributionData);

         getAuditingManager().auditEvent(factory);
     }
 
         getAuditingManager().auditEvent(factory);
     }
 

-    public void auditExternalGetAssetList(ResponseFormat responseFormat, AuditingActionEnum actionEnum, DistributionData distributionData, String requestId) {
+    public void auditExternalGetAssetList(ResponseFormat responseFormat, AuditingActionEnum actionEnum, DistributionData distributionData,
+                                          String requestId) {

         log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);
         log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);

-

         AuditEventFactory factory = new AuditAssetListExternalApiEventFactory(actionEnum,
         AuditEventFactory factory = new AuditAssetListExternalApiEventFactory(actionEnum,

-                CommonAuditData.newBuilder()
-                        .status(responseFormat.getStatus())
-                        .description(getMessageString(responseFormat))
-                        .requestId(requestId)
-                        .build(),
-                distributionData);
-
+            CommonAuditData.newBuilder().status(responseFormat.getStatus()).description(getMessageString(responseFormat)).requestId(requestId)
+                .build(), distributionData);

         getAuditingManager().auditEvent(factory);
     }
 
         getAuditingManager().auditEvent(factory);
     }
 

-    public void auditChangeLifecycleAction(ResponseFormat responseFormat, ComponentTypeEnum componentType, String requestId,
-                                           Component component, Component responseObject, DistributionData distributionData, User modifier) {
-
+    public void auditChangeLifecycleAction(ResponseFormat responseFormat, ComponentTypeEnum componentType, String requestId, Component component,
+                                           Component responseObject, DistributionData distributionData, User modifier) {

         String invariantUuid = "";
         String serviceInstanceId = "";
         ResourceVersionInfo currResourceVersionInfo = null;
         ResourceVersionInfo prevResourceVersionInfo = null;
         ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(componentType.getValue());
         String invariantUuid = "";
         String serviceInstanceId = "";
         ResourceVersionInfo currResourceVersionInfo = null;
         ResourceVersionInfo prevResourceVersionInfo = null;
         ResourceCommonInfo resourceCommonInfo = new ResourceCommonInfo(componentType.getValue());

-

         if (component != null) {
             prevResourceVersionInfo = buildResourceVersionInfoFromComponent(component);
             resourceCommonInfo.setResourceName(component.getName());
         }
         if (component != null) {
             prevResourceVersionInfo = buildResourceVersionInfoFromComponent(component);
             resourceCommonInfo.setResourceName(component.getName());
         }

-
-        if (responseObject != null){
+        if (responseObject != null) {

             currResourceVersionInfo = buildResourceVersionInfoFromComponent(responseObject);
             invariantUuid = responseObject.getInvariantUUID();
             serviceInstanceId = responseObject.getUUID();
             currResourceVersionInfo = buildResourceVersionInfoFromComponent(responseObject);
             invariantUuid = responseObject.getInvariantUUID();
             serviceInstanceId = responseObject.getUUID();

-        }
-        else if (component != null){
+        } else if (component != null) {

             currResourceVersionInfo = buildResourceVersionInfoFromComponent(component);
             invariantUuid = component.getInvariantUUID();
             serviceInstanceId = component.getUUID();
         }
             currResourceVersionInfo = buildResourceVersionInfoFromComponent(component);
             invariantUuid = component.getInvariantUUID();
             serviceInstanceId = component.getUUID();
         }

-

         if (prevResourceVersionInfo == null) {
         if (prevResourceVersionInfo == null) {

-            prevResourceVersionInfo = ResourceVersionInfo.newBuilder()
-                    .build();
+            prevResourceVersionInfo = ResourceVersionInfo.newBuilder().build();

         }
         if (currResourceVersionInfo == null) {
         }
         if (currResourceVersionInfo == null) {

-            currResourceVersionInfo = ResourceVersionInfo.newBuilder()
-                    .build();
+            currResourceVersionInfo = ResourceVersionInfo.newBuilder().build();

         }
         AuditEventFactory factory = new AuditChangeLifecycleExternalApiEventFactory(
         }
         AuditEventFactory factory = new AuditChangeLifecycleExternalApiEventFactory(

-                CommonAuditData.newBuilder()
-                        .serviceInstanceId(serviceInstanceId)
-                        .requestId(requestId)
-                        .description(getMessageString(responseFormat))
-                        .status(responseFormat.getStatus())
-                        .build(),
-                resourceCommonInfo, distributionData,
-                prevResourceVersionInfo, currResourceVersionInfo,
-                invariantUuid, modifier);
-
+            CommonAuditData.newBuilder().serviceInstanceId(serviceInstanceId).requestId(requestId).description(getMessageString(responseFormat))
+                .status(responseFormat.getStatus()).build(), resourceCommonInfo, distributionData, prevResourceVersionInfo, currResourceVersionInfo,
+            invariantUuid, modifier);

         getAuditingManager().auditEvent(factory);
     }
 
     private ResourceVersionInfo buildResourceVersionInfoFromComponent(Component component) {
         getAuditingManager().auditEvent(factory);
     }
 
     private ResourceVersionInfo buildResourceVersionInfoFromComponent(Component component) {

-        return ResourceVersionInfo.newBuilder()
-                .version(component.getVersion())
-                .state(component.getLifecycleState().name())
-                .build();
+        return ResourceVersionInfo.newBuilder().version(component.getVersion()).state(component.getLifecycleState().name()).build();

     }
 
     }
 

-    public void auditExternalCrudApi(ResponseFormat responseFormat, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo, HttpServletRequest request,
-                                     ArtifactDefinition artifactDefinition, String artifactUuid) {
+    public void auditExternalCrudApi(ResponseFormat responseFormat, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo,
+                                     HttpServletRequest request, ArtifactDefinition artifactDefinition, String artifactUuid) {

         log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);
         log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);

-

         ResourceVersionInfo currResourceVersionInfo;
         User modifier = new User();
         modifier.setUserId(request.getHeader(Constants.USER_ID_HEADER));
         String artifactData = "";
         DistributionData distributionData = new DistributionData(request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER), request.getRequestURI());
         String requestId = request.getHeader(Constants.X_ECOMP_REQUEST_ID_HEADER);
         ResourceVersionInfo currResourceVersionInfo;
         User modifier = new User();
         modifier.setUserId(request.getHeader(Constants.USER_ID_HEADER));
         String artifactData = "";
         DistributionData distributionData = new DistributionData(request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER), request.getRequestURI());
         String requestId = request.getHeader(Constants.X_ECOMP_REQUEST_ID_HEADER);

-
-

         if (artifactDefinition == null) {
         if (artifactDefinition == null) {

-            currResourceVersionInfo = ResourceVersionInfo.newBuilder()
-                    .artifactUuid(artifactUuid)
-                    .build();
-        }
-        else {
-            currResourceVersionInfo = ResourceVersionInfo.newBuilder()
-                    .artifactUuid(artifactDefinition.getArtifactUUID())
-                    .version(artifactDefinition.getArtifactVersion())
-                    .build();
+            currResourceVersionInfo = ResourceVersionInfo.newBuilder().artifactUuid(artifactUuid).build();
+        } else {
+            currResourceVersionInfo = ResourceVersionInfo.newBuilder().artifactUuid(artifactDefinition.getArtifactUUID())
+                .version(artifactDefinition.getArtifactVersion()).build();

             artifactData = buildAuditingArtifactData(artifactDefinition);
             modifier.setUserId(artifactDefinition.getUserIdLastUpdater());
         }
         AuditEventFactory factory = new AuditCrudExternalApiArtifactEventFactory(actionEnum,
             artifactData = buildAuditingArtifactData(artifactDefinition);
             modifier.setUserId(artifactDefinition.getUserIdLastUpdater());
         }
         AuditEventFactory factory = new AuditCrudExternalApiArtifactEventFactory(actionEnum,

-                CommonAuditData.newBuilder()
-                        .status(responseFormat.getStatus())
-                        .description(getMessageString(responseFormat))
-                        .requestId(requestId)
-                        .build(),
-                resourceCommonInfo, distributionData, ResourceVersionInfo.newBuilder().build(), currResourceVersionInfo,
-                null, modifier, artifactData);
-
+            CommonAuditData.newBuilder().status(responseFormat.getStatus()).description(getMessageString(responseFormat)).requestId(requestId)
+                .build(), resourceCommonInfo, distributionData, ResourceVersionInfo.newBuilder().build(), currResourceVersionInfo, null, modifier,
+            artifactData);

         getAuditingManager().auditEvent(factory);
     }
 
         getAuditingManager().auditEvent(factory);
     }
 

-    public boolean isExternalApiEvent(AuditingActionEnum auditingActionEnum){
+    public boolean isExternalApiEvent(AuditingActionEnum auditingActionEnum) {

         return auditingActionEnum != null && auditingActionEnum.getAuditingEsType().equals(AuditingTypesConstants.EXTERNAL_API_EVENT_TYPE);
     }
 
     public void auditCreateResourceExternalApi(ResponseFormat responseFormat, ResourceCommonInfo resourceCommonInfo, HttpServletRequest request,
                                                Resource resource) {
         return auditingActionEnum != null && auditingActionEnum.getAuditingEsType().equals(AuditingTypesConstants.EXTERNAL_API_EVENT_TYPE);
     }
 
     public void auditCreateResourceExternalApi(ResponseFormat responseFormat, ResourceCommonInfo resourceCommonInfo, HttpServletRequest request,
                                                Resource resource) {

-

         String invariantUuid = null;
         String serviceInstanceId = null;
         String invariantUuid = null;
         String serviceInstanceId = null;

-

         User modifier = new User();
         modifier.setUserId(request.getHeader(Constants.USER_ID_HEADER));
         DistributionData distributionData = new DistributionData(request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER), request.getRequestURI());
         String requestId = request.getHeader(Constants.X_ECOMP_REQUEST_ID_HEADER);
         User modifier = new User();
         modifier.setUserId(request.getHeader(Constants.USER_ID_HEADER));
         DistributionData distributionData = new DistributionData(request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER), request.getRequestURI());
         String requestId = request.getHeader(Constants.X_ECOMP_REQUEST_ID_HEADER);

-

         ResourceVersionInfo currResourceVersionInfo;
         ResourceVersionInfo currResourceVersionInfo;

-
-        if( resource != null ){
-            currResourceVersionInfo = ResourceVersionInfo.newBuilder()
-                    .state(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.name())
-                    .version(ImportUtils.Constants.FIRST_NON_CERTIFIED_VERSION)
-                    .build();
+        if (resource != null) {
+            currResourceVersionInfo = ResourceVersionInfo.newBuilder().state(LifecycleStateEnum.NOT_CERTIFIED_CHECKOUT.name())
+                .version(ImportUtils.Constants.FIRST_NON_CERTIFIED_VERSION).build();

             resourceCommonInfo.setResourceName(resource.getName());
             invariantUuid = resource.getInvariantUUID();
             serviceInstanceId = resource.getUUID();
             resourceCommonInfo.setResourceName(resource.getName());
             invariantUuid = resource.getInvariantUUID();
             serviceInstanceId = resource.getUUID();

+        } else {
+            currResourceVersionInfo = ResourceVersionInfo.newBuilder().build();

         }
         }

-        else {
-            currResourceVersionInfo = ResourceVersionInfo.newBuilder()
-                    .build();
-        }
-

         AuditEventFactory factory = new AuditCreateResourceExternalApiEventFactory(
         AuditEventFactory factory = new AuditCreateResourceExternalApiEventFactory(

-                CommonAuditData.newBuilder()
-                        .status(responseFormat.getStatus())
-                        .description(getMessageString(responseFormat))
-                        .requestId(requestId)
-                        .serviceInstanceId(serviceInstanceId)
-                        .build(),
-                resourceCommonInfo, distributionData,
-                currResourceVersionInfo, invariantUuid, modifier);
-
+            CommonAuditData.newBuilder().status(responseFormat.getStatus()).description(getMessageString(responseFormat)).requestId(requestId)
+                .serviceInstanceId(serviceInstanceId).build(), resourceCommonInfo, distributionData, currResourceVersionInfo, invariantUuid,
+            modifier);

         getAuditingManager().auditEvent(factory);
     }
         getAuditingManager().auditEvent(factory);
     }

-    
+

     public void auditCreateServiceExternalApi(ResponseFormat responseFormat, HttpServletRequest request, Component service) {
     public void auditCreateServiceExternalApi(ResponseFormat responseFormat, HttpServletRequest request, Component service) {

-       
-       String invariantUuid = null;
+        String invariantUuid = null;

         String serviceInstanceId = null;
         String serviceInstanceId = null;

-       
-       User modifier = new User();
+        User modifier = new User();

         modifier.setUserId(request.getHeader(Constants.USER_ID_HEADER));
         DistributionData distributionData = new DistributionData(request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER), request.getRequestURI());
         String requestId = request.getHeader(Constants.X_ECOMP_REQUEST_ID_HEADER);
         modifier.setUserId(request.getHeader(Constants.USER_ID_HEADER));
         DistributionData distributionData = new DistributionData(request.getHeader(Constants.X_ECOMP_INSTANCE_ID_HEADER), request.getRequestURI());
         String requestId = request.getHeader(Constants.X_ECOMP_REQUEST_ID_HEADER);

-        
-        if(null != service) {
-               invariantUuid = service.getInvariantUUID();
-               serviceInstanceId = service.getUUID();
-        }
-        
-       AuditEventFactory factory = new AuditCreateServiceExternalApiEventFactory(
-                CommonAuditData.newBuilder()
-                        .status(responseFormat.getStatus())
-                        .description(getMessageString(responseFormat))
-                        .requestId(requestId)
-                        .serviceInstanceId(serviceInstanceId)
-                        .build(),
-                        new ResourceCommonInfo(ComponentTypeEnum.SERVICE.name()), distributionData, invariantUuid, modifier);
-
+        if (null != service) {
+            invariantUuid = service.getInvariantUUID();
+            serviceInstanceId = service.getUUID();
+        }
+        AuditEventFactory factory = new AuditCreateServiceExternalApiEventFactory(
+            CommonAuditData.newBuilder().status(responseFormat.getStatus()).description(getMessageString(responseFormat)).requestId(requestId)
+                .serviceInstanceId(serviceInstanceId).build(), new ResourceCommonInfo(ComponentTypeEnum.SERVICE.name()), distributionData,
+            invariantUuid, modifier);

         getAuditingManager().auditEvent(factory);
         getAuditingManager().auditEvent(factory);

-       

     }
 
     }
 

-    public void auditExternalActivateService(ResponseFormat responseFormat, DistributionData distributionData, String requestId, String serviceInstanceUuid, User modifier) {
+    public void auditExternalActivateService(ResponseFormat responseFormat, DistributionData distributionData, String requestId,
+                                             String serviceInstanceUuid, User modifier) {

         AuditEventFactory factory = new AuditActivateServiceExternalApiEventFactory(
         AuditEventFactory factory = new AuditActivateServiceExternalApiEventFactory(

-                CommonAuditData.newBuilder()
-                        .serviceInstanceId(serviceInstanceUuid)
-                        .description(getMessageString(responseFormat))
-                        .status(responseFormat.getStatus())
-                        .requestId(requestId)
-                        .build(),
-                new ResourceCommonInfo(ComponentTypeEnum.SERVICE.name()), distributionData, "", modifier);
+            CommonAuditData.newBuilder().serviceInstanceId(serviceInstanceUuid).description(getMessageString(responseFormat))
+                .status(responseFormat.getStatus()).requestId(requestId).build(), new ResourceCommonInfo(ComponentTypeEnum.SERVICE.name()),
+            distributionData, "", modifier);

         getAuditingManager().auditEvent(factory);
     }
 
         getAuditingManager().auditEvent(factory);
     }
 

-    public void auditExternalDownloadArtifact(ResponseFormat responseFormat, ResourceCommonInfo resourceCommonInfo,
-                                              DistributionData distributionData, String requestId, String currArtifactUuid, String userId) {
+    public void auditExternalDownloadArtifact(ResponseFormat responseFormat, ResourceCommonInfo resourceCommonInfo, DistributionData distributionData,
+                                              String requestId, String currArtifactUuid, String userId) {

         User modifier = new User();
         modifier.setUserId(userId);
         User modifier = new User();
         modifier.setUserId(userId);

-

         AuditEventFactory factory = new AuditDownloadArtifactExternalApiEventFactory(
         AuditEventFactory factory = new AuditDownloadArtifactExternalApiEventFactory(

-                CommonAuditData.newBuilder()
-                        .description(getMessageString(responseFormat))
-                        .status(responseFormat.getStatus())
-                        .requestId(requestId)
-                        .build(),
-                resourceCommonInfo, distributionData,
-                ResourceVersionInfo.newBuilder()
-                        .artifactUuid(currArtifactUuid)
-                        .build(),
-                modifier);
+            CommonAuditData.newBuilder().description(getMessageString(responseFormat)).status(responseFormat.getStatus()).requestId(requestId)
+                .build(), resourceCommonInfo, distributionData, ResourceVersionInfo.newBuilder().artifactUuid(currArtifactUuid).build(), modifier);

         getAuditingManager().auditEvent(factory);
     }
 
     private String buildAuditingArtifactData(ArtifactDefinition artifactDefinition) {
         StringBuilder sb = new StringBuilder();
         if (artifactDefinition != null) {
         getAuditingManager().auditEvent(factory);
     }
 
     private String buildAuditingArtifactData(ArtifactDefinition artifactDefinition) {
         StringBuilder sb = new StringBuilder();
         if (artifactDefinition != null) {

-            sb.append(artifactDefinition.getArtifactGroupType().getType())
-                    .append(",")
-                    .append("'")
-                    .append(artifactDefinition.getArtifactLabel())
-                    .append("'")
-                    .append(",")
-                    .append(artifactDefinition.getArtifactType())
-                    .append(",")
-                    .append(artifactDefinition.getArtifactName())
-                    .append(",")
-                    .append(artifactDefinition.getTimeout())
-                    .append(",")
-                    .append(artifactDefinition.getEsId());
-
+            sb.append(artifactDefinition.getArtifactGroupType().getType()).append(",").append("'").append(artifactDefinition.getArtifactLabel())
+                .append("'").append(",").append(artifactDefinition.getArtifactType()).append(",").append(artifactDefinition.getArtifactName())
+                .append(",").append(artifactDefinition.getTimeout()).append(",").append(artifactDefinition.getEsId());

             sb.append(",");
             sb.append(artifactDefinition.getArtifactVersion() != null ? artifactDefinition.getArtifactVersion() : " ");
             sb.append(",");
             sb.append(",");
             sb.append(artifactDefinition.getArtifactVersion() != null ? artifactDefinition.getArtifactVersion() : " ");
             sb.append(",");


@@ -754,27 +681,20 @@ public class ComponentsUtils {
         return sb.toString();
     }
 
         return sb.toString();
     }
 

-    public void auditCategory(ResponseFormat responseFormat, User modifier, String categoryName, String subCategoryName, String groupingName, AuditingActionEnum actionEnum, String componentType) {
+    public void auditCategory(ResponseFormat responseFormat, User modifier, String categoryName, String subCategoryName, String groupingName,
+                              AuditingActionEnum actionEnum, String componentType) {

         log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);
         log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);

-

         AuditEventFactory factory = new AuditCategoryEventFactory(actionEnum,
         AuditEventFactory factory = new AuditCategoryEventFactory(actionEnum,

-                CommonAuditData.newBuilder()
-                        .description(getMessageString(responseFormat))
-                        .status(responseFormat.getStatus())
-                        .requestId(ThreadLocalsHolder.getUuid())
-                        .build(),
-                modifier, categoryName, subCategoryName, groupingName, componentType);
-
+            CommonAuditData.newBuilder().description(getMessageString(responseFormat)).status(responseFormat.getStatus())
+                .requestId(ThreadLocalsHolder.getUuid()).build(), modifier, categoryName, subCategoryName, groupingName, componentType);

         getAuditingManager().auditEvent(factory);
     }
 
     public ActionStatus convertFromStorageResponse(StorageOperationStatus storageResponse) {
         getAuditingManager().auditEvent(factory);
     }
 
     public ActionStatus convertFromStorageResponse(StorageOperationStatus storageResponse) {

-

         return convertFromStorageResponse(storageResponse, ComponentTypeEnum.RESOURCE);
     }
 
     public ActionStatus convertFromStorageResponse(StorageOperationStatus storageResponse, ComponentTypeEnum type) {
         return convertFromStorageResponse(storageResponse, ComponentTypeEnum.RESOURCE);
     }
 
     public ActionStatus convertFromStorageResponse(StorageOperationStatus storageResponse, ComponentTypeEnum type) {

-

         ActionStatus responseEnum = ActionStatus.GENERAL_ERROR;
         if (storageResponse == null) {
             return responseEnum;
         ActionStatus responseEnum = ActionStatus.GENERAL_ERROR;
         if (storageResponse == null) {
             return responseEnum;


@@ -847,9 +767,15 @@ public class ComponentsUtils {
             case COMPONENT_IS_ARCHIVED:
                 responseEnum = ActionStatus.COMPONENT_IS_ARCHIVED;
                 break;
             case COMPONENT_IS_ARCHIVED:
                 responseEnum = ActionStatus.COMPONENT_IS_ARCHIVED;
                 break;

-        case DECLARED_INPUT_USED_BY_OPERATION:
-            responseEnum = ActionStatus.DECLARED_INPUT_USED_BY_OPERATION;
-            break;
+            case COMPONENT_NOT_ARCHIVED:
+                responseEnum = ActionStatus.COMPONENT_NOT_ARCHIVED;
+                break;
+            case COMPONENT_IS_IN_USE:
+                responseEnum = ActionStatus.COMPONENT_IN_USE_BY_ANOTHER_COMPONENT;
+                break;
+            case DECLARED_INPUT_USED_BY_OPERATION:
+                responseEnum = ActionStatus.DECLARED_INPUT_USED_BY_OPERATION;
+                break;

             default:
                 responseEnum = ActionStatus.GENERAL_ERROR;
                 break;
             default:
                 responseEnum = ActionStatus.GENERAL_ERROR;
                 break;


@@ -878,7 +804,6 @@ public class ComponentsUtils {
 
     public ActionStatus convertFromStorageResponseForCapabilityType(StorageOperationStatus storageResponse) {
         ActionStatus responseEnum;
 
     public ActionStatus convertFromStorageResponseForCapabilityType(StorageOperationStatus storageResponse) {
         ActionStatus responseEnum;

-

         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;
         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;


@@ -906,7 +831,6 @@ public class ComponentsUtils {
 
     public ActionStatus convertFromStorageResponseForLifecycleType(StorageOperationStatus storageResponse) {
         ActionStatus responseEnum;
 
     public ActionStatus convertFromStorageResponseForLifecycleType(StorageOperationStatus storageResponse) {
         ActionStatus responseEnum;

-

         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;
         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;


@@ -934,7 +858,6 @@ public class ComponentsUtils {
 
     public ActionStatus convertFromStorageResponseForResourceInstance(StorageOperationStatus storageResponse, boolean isRelation) {
         ActionStatus responseEnum;
 
     public ActionStatus convertFromStorageResponseForResourceInstance(StorageOperationStatus storageResponse, boolean isRelation) {
         ActionStatus responseEnum;

-

         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;
         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;


@@ -974,11 +897,9 @@ public class ComponentsUtils {
 
     public ResponseFormat getResponseFormatForResourceInstance(ActionStatus actionStatus, String serviceName, String resourceInstanceName) {
         ResponseFormat responseFormat;
 
     public ResponseFormat getResponseFormatForResourceInstance(ActionStatus actionStatus, String serviceName, String resourceInstanceName) {
         ResponseFormat responseFormat;

-

         if (actionStatus == ActionStatus.RESOURCE_INSTANCE_NOT_FOUND) {
             responseFormat = getResponseFormat(actionStatus, resourceInstanceName);
         if (actionStatus == ActionStatus.RESOURCE_INSTANCE_NOT_FOUND) {
             responseFormat = getResponseFormat(actionStatus, resourceInstanceName);

-        }
-        else {
+        } else {

             responseFormat = getResponseFormat(actionStatus, serviceName);
         }
         return responseFormat;
             responseFormat = getResponseFormat(actionStatus, serviceName);
         }
         return responseFormat;


@@ -988,8 +909,7 @@ public class ComponentsUtils {
         ResponseFormat responseFormat;
         if (actionStatus == ActionStatus.RESOURCE_INSTANCE_NOT_FOUND) {
             responseFormat = getResponseFormat(actionStatus, resourceInstanceName);
         ResponseFormat responseFormat;
         if (actionStatus == ActionStatus.RESOURCE_INSTANCE_NOT_FOUND) {
             responseFormat = getResponseFormat(actionStatus, resourceInstanceName);

-        }
-        else {
+        } else {

             responseFormat = getResponseFormat(actionStatus);
         }
         return responseFormat;
             responseFormat = getResponseFormat(actionStatus);
         }
         return responseFormat;


@@ -997,7 +917,6 @@ public class ComponentsUtils {
 
     public ActionStatus convertFromStorageResponseForResourceInstanceProperty(StorageOperationStatus storageResponse) {
         ActionStatus responseEnum;
 
     public ActionStatus convertFromStorageResponseForResourceInstanceProperty(StorageOperationStatus storageResponse) {
         ActionStatus responseEnum;

-

         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;
         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;


@@ -1028,36 +947,46 @@ public class ComponentsUtils {
         return responseEnum;
     }
 
         return responseEnum;
     }
 

-    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevComponent, String comment) {
+    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum,
+                               ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevComponent, String comment) {

         auditComponent(responseFormat, modifier, component, actionEnum, resourceCommonInfo, prevComponent, null, comment, null, null);
     }
 
         auditComponent(responseFormat, modifier, component, actionEnum, resourceCommonInfo, prevComponent, null, comment, null, null);
     }
 

-    public void auditComponentAdmin(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ComponentTypeEnum typeEnum) {
-        auditComponent(responseFormat, modifier, component, actionEnum, new ResourceCommonInfo(typeEnum.getValue()), ResourceVersionInfo.newBuilder().build());
+    public void auditComponentAdmin(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum,
+                                    ComponentTypeEnum typeEnum) {
+        auditComponent(responseFormat, modifier, component, actionEnum, new ResourceCommonInfo(typeEnum.getValue()),
+            ResourceVersionInfo.newBuilder().build());

     }
 
     }
 

-    public void auditComponentAdmin(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ComponentTypeEnum typeEnum, String comment) {
-        auditComponent(responseFormat, modifier, component, actionEnum, new ResourceCommonInfo(typeEnum.getValue()), ResourceVersionInfo.newBuilder().build(), null,
-                comment, null, null);
+    public void auditComponentAdmin(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum,
+                                    ComponentTypeEnum typeEnum, String comment) {
+        auditComponent(responseFormat, modifier, component, actionEnum, new ResourceCommonInfo(typeEnum.getValue()),
+            ResourceVersionInfo.newBuilder().build(), null, comment, null, null);

     }
 
     }
 

-    public void auditComponentAdmin(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ComponentTypeEnum typeEnum, ResourceVersionInfo prevComponent) {
+    public void auditComponentAdmin(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum,
+                                    ComponentTypeEnum typeEnum, ResourceVersionInfo prevComponent) {

         auditComponent(responseFormat, modifier, component, actionEnum, new ResourceCommonInfo(typeEnum.getValue()), prevComponent);
     }
 
         auditComponent(responseFormat, modifier, component, actionEnum, new ResourceCommonInfo(typeEnum.getValue()), prevComponent);
     }
 

-    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevComponent) {
+    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum,
+                               ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevComponent) {

         auditComponent(responseFormat, modifier, component, actionEnum, resourceCommonInfo, prevComponent, null, null, null, null);
     }
 
         auditComponent(responseFormat, modifier, component, actionEnum, resourceCommonInfo, prevComponent, null, null, null, null);
     }
 

-    public void auditComponent(ResponseFormat responseFormat, User modifier, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo, String comment) {
-        auditComponent(responseFormat, modifier, null, actionEnum, resourceCommonInfo, ResourceVersionInfo.newBuilder().build(), null, comment, null, null);
+    public void auditComponent(ResponseFormat responseFormat, User modifier, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo,
+                               String comment) {
+        auditComponent(responseFormat, modifier, null, actionEnum, resourceCommonInfo, ResourceVersionInfo.newBuilder().build(), null, comment, null,
+            null);

     }
 
     }
 

-    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevComponent, ResourceVersionInfo currComponent) {
+    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum,
+                               ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevComponent, ResourceVersionInfo currComponent) {

         auditComponent(responseFormat, modifier, component, actionEnum, resourceCommonInfo, prevComponent, currComponent, null, null, null);
     }
 
         auditComponent(responseFormat, modifier, component, actionEnum, resourceCommonInfo, prevComponent, currComponent, null, null, null);
     }
 

-    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum, ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevComponent, ResourceVersionInfo currComponent,
+    public void auditComponent(ResponseFormat responseFormat, User modifier, Component component, AuditingActionEnum actionEnum,
+                               ResourceCommonInfo resourceCommonInfo, ResourceVersionInfo prevComponent, ResourceVersionInfo currComponent,

                                String comment, ArtifactDefinition artifactDefinition, String did) {
         if (actionEnum != null) {
             String uuid = null;
                                String comment, ArtifactDefinition artifactDefinition, String did) {
         if (actionEnum != null) {
             String uuid = null;


@@ -1066,13 +995,10 @@ public class ComponentsUtils {
             String currArtifactUid = null;
             String currVersion = null;
             String dcurrStatus = null;
             String currArtifactUid = null;
             String currVersion = null;
             String dcurrStatus = null;

-

             log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);
             log.trace(INSIDE_AUDITING_FOR_AUDIT_ACTION, actionEnum);

-

             String message = getMessageString(responseFormat);
             int status = responseFormat.getStatus();
             String artifactData = buildAuditingArtifactData(artifactDefinition);
             String message = getMessageString(responseFormat);
             int status = responseFormat.getStatus();
             String artifactData = buildAuditingArtifactData(artifactDefinition);

-

             if (component != null) {
                 // fields that are filled during creation and might still be empty
                 if (component.getLifecycleState() != null) {
             if (component != null) {
                 // fields that are filled during creation and might still be empty
                 if (component.getLifecycleState() != null) {


@@ -1095,192 +1021,117 @@ public class ComponentsUtils {
                     currVersion = currComponent.getVersion();
                 }
             }
                     currVersion = currComponent.getVersion();
                 }
             }

-            AuditEventFactory factory = AuditResourceEventFactoryManager.createResourceEventFactory(
-                    actionEnum,
-                    CommonAuditData.newBuilder()
-                            .status(status)
-                            .description(message)
-                            .requestId(ThreadLocalsHolder.getUuid())
-                            .serviceInstanceId(uuid)
-                            .build(),
-                    resourceCommonInfo, prevComponent,
-                    ResourceVersionInfo.newBuilder()
-                            .artifactUuid(currArtifactUid)
-                            .state(currState)
-                            .version(currVersion)
-                            .distributionStatus(dcurrStatus)
-                            .build(),
-                    invariantUUID,
-                    modifier, artifactData, comment, did, null);
-
+            AuditEventFactory factory = AuditResourceEventFactoryManager.createResourceEventFactory(actionEnum,
+                CommonAuditData.newBuilder().status(status).description(message).requestId(ThreadLocalsHolder.getUuid()).serviceInstanceId(uuid)
+                    .build(), resourceCommonInfo, prevComponent,
+                ResourceVersionInfo.newBuilder().artifactUuid(currArtifactUid).state(currState).version(currVersion).distributionStatus(dcurrStatus)
+                    .build(), invariantUUID, modifier, artifactData, comment, did, null);

             getAuditingManager().auditEvent(factory);
         }
     }
 
             getAuditingManager().auditEvent(factory);
         }
     }
 

-    public void auditDistributionEngine(AuditingActionEnum action, String environmentName, DistributionTopicData distributionTopicData, String status) {
+    public void auditDistributionEngine(AuditingActionEnum action, String environmentName, DistributionTopicData distributionTopicData,
+                                        String status) {

         auditDistributionEngine(action, environmentName, distributionTopicData, null, null, status);
     }
 
         auditDistributionEngine(action, environmentName, distributionTopicData, null, null, status);
     }
 

-
-    public void auditDistributionEngine(AuditingActionEnum action, String environmentName, DistributionTopicData distributionTopicData, String role, String apiKey, String status) {
-        AuditEventFactory factory = AuditDistributionEngineEventFactoryManager.createDistributionEngineEventFactory(action,
-                environmentName, distributionTopicData, role, apiKey, status);
+    public void auditDistributionEngine(AuditingActionEnum action, String environmentName, DistributionTopicData distributionTopicData, String role,
+                                        String apiKey, String status) {
+        AuditEventFactory factory = AuditDistributionEngineEventFactoryManager
+            .createDistributionEngineEventFactory(action, environmentName, distributionTopicData, role, apiKey, status);

         getAuditingManager().auditEvent(factory);
     }
 
         getAuditingManager().auditEvent(factory);
     }
 

-
-    public void auditEnvironmentEngine(AuditingActionEnum actionEnum, String environmentID,
-                                       String environmentType, String action, String environmentName, String tenantContext) {
-        AuditEventFactory factory = new AuditEcompOpEnvEventFactory(actionEnum, environmentID, environmentName,
-                environmentType, action, tenantContext);
+    public void auditEnvironmentEngine(AuditingActionEnum actionEnum, String environmentID, String environmentType, String action,
+                                       String environmentName, String tenantContext) {
+        AuditEventFactory factory = new AuditEcompOpEnvEventFactory(actionEnum, environmentID, environmentName, environmentType, action,
+            tenantContext);

         audit.startAuditFetchLog(PARTNER_NAME, DmaapConsumer.class.getName());
         audit.startAuditFetchLog(PARTNER_NAME, DmaapConsumer.class.getName());

-        audit.logEntry(LogLevel.INFO, Severity.OK, null,
-                MarkerFactory.getMarker(ONAPLogConstants.Markers.ENTRY.getName()), environmentID);
+        audit.logEntry(LogLevel.INFO, Severity.OK, null, MarkerFactory.getMarker(ONAPLogConstants.Markers.ENTRY.getName()), environmentID);

         getAuditingManager().auditEvent(factory, audit);
     }
 
         getAuditingManager().auditEvent(factory, audit);
     }
 

-    public void auditDistributionNotification(String serviceUUID, String resourceName, String resourceType, String currVersion, User modifier, String environmentName, String currState,
-                                              String topicName, String distributionId, String description, String status, String workloadContext, String tenant) {
-
+    public void auditDistributionNotification(String serviceUUID, String resourceName, String resourceType, String currVersion, User modifier,
+                                              String environmentName, String currState, String topicName, String distributionId, String description,
+                                              String status, String workloadContext, String tenant) {

         AuditEventFactory factory = new AuditDistributionNotificationEventFactory(
         AuditEventFactory factory = new AuditDistributionNotificationEventFactory(

-                CommonAuditData.newBuilder()
-                        .serviceInstanceId(serviceUUID)
-                        .status(status)
-                        .description(description)
-                        .requestId(ThreadLocalsHolder.getUuid())
-                        .build(),
-                new ResourceCommonInfo(resourceName, resourceType),
-                ResourceVersionInfo.newBuilder()
-                        .state(currState)
-                        .version(currVersion)
-                        .build(),
-                distributionId, modifier, topicName,
-                new OperationalEnvAuditData(environmentName, workloadContext, tenant));
-
+            CommonAuditData.newBuilder().serviceInstanceId(serviceUUID).status(status).description(description)
+                .requestId(ThreadLocalsHolder.getUuid()).build(), new ResourceCommonInfo(resourceName, resourceType),
+            ResourceVersionInfo.newBuilder().state(currState).version(currVersion).build(), distributionId, modifier, topicName,
+            new OperationalEnvAuditData(environmentName, workloadContext, tenant));

         getAuditingManager().auditEvent(factory);
     }
 
     public void auditAuthEvent(String url, String user, String authStatus, String realm) {
         getAuditingManager().auditEvent(factory);
     }
 
     public void auditAuthEvent(String url, String user, String authStatus, String realm) {

-        AuditEventFactory factory = new AuditAuthRequestEventFactory(
-                CommonAuditData.newBuilder()
-                        .requestId(ThreadLocalsHolder.getUuid())
-                        .build(),
-                user, url, realm, authStatus);
+        AuditEventFactory factory = new AuditAuthRequestEventFactory(CommonAuditData.newBuilder().requestId(ThreadLocalsHolder.getUuid()).build(),
+            user, url, realm, authStatus);

         getAuditingManager().auditEvent(factory);
     }
 
         getAuditingManager().auditEvent(factory);
     }
 

-    public void auditDistributionStatusNotification(String distributionId, String consumerId, String topicName,
-                                                    String resourceUrl, String statusTime, String status,
-                                                    String errorReason, LoggerSdcAudit audit) {
-        AuditEventFactory factory =  new AuditDistributionStatusEventFactory(
-                CommonAuditData.newBuilder()
-                        .description(errorReason)
-                        .status(status)
-                        .requestId(distributionId)
-                        .build(),
-                new DistributionData(consumerId, resourceUrl),
-                distributionId, topicName, statusTime);
-
+    public void auditDistributionStatusNotification(String distributionId, String consumerId, String topicName, String resourceUrl, String statusTime,
+                                                    String status, String errorReason, LoggerSdcAudit audit) {
+        AuditEventFactory factory = new AuditDistributionStatusEventFactory(
+            CommonAuditData.newBuilder().description(errorReason).status(status).requestId(distributionId).build(),
+            new DistributionData(consumerId, resourceUrl), distributionId, topicName, statusTime);

         getAuditingManager().auditEvent(factory, audit);
     }
 
     public void auditGetUebCluster(String consumerId, String status, String description) {
         AuditEventFactory factory = new AuditGetUebClusterEventFactory(
         getAuditingManager().auditEvent(factory, audit);
     }
 
     public void auditGetUebCluster(String consumerId, String status, String description) {
         AuditEventFactory factory = new AuditGetUebClusterEventFactory(

-                CommonAuditData.newBuilder()
-                        .description(description)
-                        .status(status)
-                        .requestId(ThreadLocalsHolder.getUuid())
-                        .build(),
-                consumerId);
-
+            CommonAuditData.newBuilder().description(description).status(status).requestId(ThreadLocalsHolder.getUuid()).build(), consumerId);

         getAuditingManager().auditEvent(factory);
     }
 
     public void auditMissingInstanceIdAsDistributionEngineEvent(AuditingActionEnum actionEnum, String status) {
         getAuditingManager().auditEvent(factory);
     }
 
     public void auditMissingInstanceIdAsDistributionEngineEvent(AuditingActionEnum actionEnum, String status) {

-        AuditEventFactory factory = AuditDistributionEngineEventFactoryManager.createDistributionEngineEventFactory(
-                actionEnum, "",
-                DistributionTopicData.newBuilder()
-                        .build(), null, null, status);
+        AuditEventFactory factory = AuditDistributionEngineEventFactoryManager
+            .createDistributionEngineEventFactory(actionEnum, "", DistributionTopicData.newBuilder().build(), null, null, status);

         getAuditingManager().auditEvent(factory);
     }
 
         getAuditingManager().auditEvent(factory);
     }
 

-
-    public void auditRegisterOrUnRegisterEvent(AuditingActionEnum action, String consumerId, String apiPublicKey, String envName, String status, String distributionStatus, String notifTopicName, String statusTopicName) {
+    public void auditRegisterOrUnRegisterEvent(AuditingActionEnum action, String consumerId, String apiPublicKey, String envName, String status,
+                                               String distributionStatus, String notifTopicName, String statusTopicName) {

         String appliedStatus = !StringUtils.isEmpty(status) ? status : distributionStatus;
         String appliedStatus = !StringUtils.isEmpty(status) ? status : distributionStatus;

-

         AuditEventFactory factory = new AuditRegUnregDistributionEngineEventFactory(action,
         AuditEventFactory factory = new AuditRegUnregDistributionEngineEventFactory(action,

-                CommonAuditData.newBuilder()
-                        .requestId(ThreadLocalsHolder.getUuid())
-                        .status(appliedStatus)
-                        .build(),
-                DistributionTopicData.newBuilder()
-                        .statusTopic(statusTopicName)
-                        .notificationTopic(notifTopicName)
-                        .build(),
-                consumerId, apiPublicKey, envName);
-
+            CommonAuditData.newBuilder().requestId(ThreadLocalsHolder.getUuid()).status(appliedStatus).build(),
+            DistributionTopicData.newBuilder().statusTopic(statusTopicName).notificationTopic(notifTopicName).build(), consumerId, apiPublicKey,
+            envName);

         getAuditingManager().auditEvent(factory);
     }
 
         getAuditingManager().auditEvent(factory);
     }
 

-    public void auditServiceDistributionDeployed(String serviceName, String serviceVersion, String serviceUUID, String distributionId, String status, String desc, User modifier) {
-
+    public void auditServiceDistributionDeployed(String serviceName, String serviceVersion, String serviceUUID, String distributionId, String status,
+                                                 String desc, User modifier) {

         AuditEventFactory factory = new AuditDistributionDeployEventFactory(
         AuditEventFactory factory = new AuditDistributionDeployEventFactory(

-                CommonAuditData.newBuilder()
-                        .requestId(ThreadLocalsHolder.getUuid())
-                        .serviceInstanceId(serviceUUID)
-                        .status(status)
-                        .description(desc)
-                        .build(),
-                new ResourceCommonInfo(serviceName, "Service"),
-                distributionId,
-                modifier,
-                serviceVersion);
-
+            CommonAuditData.newBuilder().requestId(ThreadLocalsHolder.getUuid()).serviceInstanceId(serviceUUID).status(status).description(desc)
+                .build(), new ResourceCommonInfo(serviceName, "Service"), distributionId, modifier, serviceVersion);

         getAuditingManager().auditEvent(factory);
         getAuditingManager().auditEvent(factory);

-

     }
 
     }
 

-    public void auditConsumerCredentialsEvent(AuditingActionEnum actionEnum, ConsumerDefinition consumer, ResponseFormat responseFormat, User modifier) {
+    public void auditConsumerCredentialsEvent(AuditingActionEnum actionEnum, ConsumerDefinition consumer, ResponseFormat responseFormat,
+                                              User modifier) {

         AuditEventFactory factory = new AuditConsumerEventFactory(actionEnum,
         AuditEventFactory factory = new AuditConsumerEventFactory(actionEnum,

-                CommonAuditData.newBuilder()
-                        .description(getMessageString(responseFormat))
-                        .status(responseFormat.getStatus())
-                        .requestId(ThreadLocalsHolder.getUuid())
-                        .build(),
-                modifier, consumer);
-
+            CommonAuditData.newBuilder().description(getMessageString(responseFormat)).status(responseFormat.getStatus())
+                .requestId(ThreadLocalsHolder.getUuid()).build(), modifier, consumer);

         getAuditingManager().auditEvent(factory);
     }
 
     public void auditGetUsersList(User user, String details, ResponseFormat responseFormat) {
         getAuditingManager().auditEvent(factory);
     }
 
     public void auditGetUsersList(User user, String details, ResponseFormat responseFormat) {

-

         AuditEventFactory factory = new AuditGetUsersListEventFactory(
         AuditEventFactory factory = new AuditGetUsersListEventFactory(

-                CommonAuditData.newBuilder()
-                        .description(getMessageString(responseFormat))
-                        .status(responseFormat.getStatus())
-                        .requestId(ThreadLocalsHolder.getUuid())
-                        .build(),
-                user, details);
+            CommonAuditData.newBuilder().description(getMessageString(responseFormat)).status(responseFormat.getStatus())
+                .requestId(ThreadLocalsHolder.getUuid()).build(), user, details);

         getAuditingManager().auditEvent(factory);
     }
 
         getAuditingManager().auditEvent(factory);
     }
 

-    public void auditAdminUserActionAndThrowException(AuditingActionEnum actionEnum, User modifier, User userBefore,
-                                                      User userAfter, ActionStatus status, String... params) {
+    public void auditAdminUserActionAndThrowException(AuditingActionEnum actionEnum, User modifier, User userBefore, User userAfter,
+                                                      ActionStatus status, String... params) {

         ResponseFormat responseFormat = getResponseFormat(status, params);
         auditAdminUserAction(actionEnum, modifier, userBefore, userAfter, responseFormat);
         throw new ByResponseFormatComponentException(responseFormat);
     }
 
     public void auditAdminUserAction(AuditingActionEnum actionEnum, User modifier, User userBefore, User userAfter, ResponseFormat responseFormat) {
         ResponseFormat responseFormat = getResponseFormat(status, params);
         auditAdminUserAction(actionEnum, modifier, userBefore, userAfter, responseFormat);
         throw new ByResponseFormatComponentException(responseFormat);
     }
 
     public void auditAdminUserAction(AuditingActionEnum actionEnum, User modifier, User userBefore, User userAfter, ResponseFormat responseFormat) {

-

         AuditEventFactory factory = new AuditUserAdminEventFactory(actionEnum,
         AuditEventFactory factory = new AuditUserAdminEventFactory(actionEnum,

-                CommonAuditData.newBuilder()
-                        .description(getMessageString(responseFormat))
-                        .status(responseFormat.getStatus())
-                        .requestId(ThreadLocalsHolder.getUuid())
-                        .build(),
-                modifier, userBefore, userAfter);
-
+            CommonAuditData.newBuilder().description(getMessageString(responseFormat)).status(responseFormat.getStatus())
+                .requestId(ThreadLocalsHolder.getUuid()).build(), modifier, userBefore, userAfter);

         getAuditingManager().auditEvent(factory);
     }
 
         getAuditingManager().auditEvent(factory);
     }
 


@@ -1289,26 +1140,16 @@ public class ComponentsUtils {
     }
 
     public void auditUserAccess(User user, ResponseFormat responseFormat) {
     }
 
     public void auditUserAccess(User user, ResponseFormat responseFormat) {

-
-        AuditEventFactory factory = new AuditUserAccessEventFactory(CommonAuditData.newBuilder()
-                .description(getMessageString(responseFormat))
-                .status(responseFormat.getStatus())
-                .requestId(ThreadLocalsHolder.getUuid())
-                .build(),
-                user);
-
+        AuditEventFactory factory = new AuditUserAccessEventFactory(
+            CommonAuditData.newBuilder().description(getMessageString(responseFormat)).status(responseFormat.getStatus())
+                .requestId(ThreadLocalsHolder.getUuid()).build(), user);

         getAuditingManager().auditEvent(factory);
     }
 
     public void auditGetCategoryHierarchy(User user, String details, ResponseFormat responseFormat) {
         getAuditingManager().auditEvent(factory);
     }
 
     public void auditGetCategoryHierarchy(User user, String details, ResponseFormat responseFormat) {

-
-        AuditEventFactory factory = new AuditGetCategoryHierarchyEventFactory(CommonAuditData.newBuilder()
-                .description(getMessageString(responseFormat))
-                .status(responseFormat.getStatus())
-                .requestId(ThreadLocalsHolder.getUuid())
-                .build(),
-                user, details);
-
+        AuditEventFactory factory = new AuditGetCategoryHierarchyEventFactory(
+            CommonAuditData.newBuilder().description(getMessageString(responseFormat)).status(responseFormat.getStatus())
+                .requestId(ThreadLocalsHolder.getUuid()).build(), user, details);

         getAuditingManager().auditEvent(factory);
     }
 
         getAuditingManager().auditEvent(factory);
     }
 


@@ -1317,22 +1158,24 @@ public class ComponentsUtils {
             return getResponseFormat(actionStatus);
         }
         ResponseFormat responseFormat;
             return getResponseFormat(actionStatus);
         }
         ResponseFormat responseFormat;

-

         switch (actionStatus) {
             case COMPONENT_VERSION_ALREADY_EXIST:
                 responseFormat = getResponseFormat(ActionStatus.COMPONENT_VERSION_ALREADY_EXIST, type.getValue(), component.getVersion());
                 break;
             case RESOURCE_NOT_FOUND:
         switch (actionStatus) {
             case COMPONENT_VERSION_ALREADY_EXIST:
                 responseFormat = getResponseFormat(ActionStatus.COMPONENT_VERSION_ALREADY_EXIST, type.getValue(), component.getVersion());
                 break;
             case RESOURCE_NOT_FOUND:

-                responseFormat = getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND, component.getComponentMetadataDefinition().getMetadataDataDefinition().getName());
+                responseFormat = getResponseFormat(ActionStatus.RESOURCE_NOT_FOUND,
+                    component.getComponentMetadataDefinition().getMetadataDataDefinition().getName());

                 break;
             case COMPONENT_NAME_ALREADY_EXIST:
                 break;
             case COMPONENT_NAME_ALREADY_EXIST:

-                responseFormat = getResponseFormat(ActionStatus.COMPONENT_NAME_ALREADY_EXIST, type.getValue(), component.getComponentMetadataDefinition().getMetadataDataDefinition().getName());
+                responseFormat = getResponseFormat(ActionStatus.COMPONENT_NAME_ALREADY_EXIST, type.getValue(),
+                    component.getComponentMetadataDefinition().getMetadataDataDefinition().getName());

                 break;
             case COMPONENT_IN_USE:
                 responseFormat = getResponseFormat(ActionStatus.COMPONENT_IN_USE, type.name().toLowerCase(), component.getUniqueId());
                 break;
             case SERVICE_DEPLOYMENT_ARTIFACT_NOT_FOUND:
                 break;
             case COMPONENT_IN_USE:
                 responseFormat = getResponseFormat(ActionStatus.COMPONENT_IN_USE, type.name().toLowerCase(), component.getUniqueId());
                 break;
             case SERVICE_DEPLOYMENT_ARTIFACT_NOT_FOUND:

-                responseFormat = getResponseFormat(ActionStatus.SERVICE_DEPLOYMENT_ARTIFACT_NOT_FOUND, component.getComponentMetadataDefinition().getMetadataDataDefinition().getName());
+                responseFormat = getResponseFormat(ActionStatus.SERVICE_DEPLOYMENT_ARTIFACT_NOT_FOUND,
+                    component.getComponentMetadataDefinition().getMetadataDataDefinition().getName());

                 break;
             default:
                 responseFormat = getResponseFormat(actionStatus);
                 break;
             default:
                 responseFormat = getResponseFormat(actionStatus);


@@ -1347,7 +1190,6 @@ public class ComponentsUtils {
 
     public ActionStatus convertFromStorageResponseForAdditionalInformation(StorageOperationStatus storageResponse) {
         ActionStatus responseEnum;
 
     public ActionStatus convertFromStorageResponseForAdditionalInformation(StorageOperationStatus storageResponse) {
         ActionStatus responseEnum;

-

         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;
         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;


@@ -1373,7 +1215,7 @@ public class ComponentsUtils {
                 responseEnum = ActionStatus.OK;
                 break;
             case ELEMENT_NOT_FOUND:
                 responseEnum = ActionStatus.OK;
                 break;
             case ELEMENT_NOT_FOUND:

-                if(elementType!= null && elementType == JsonPresentationFields.PROPERTY){
+                if (elementType != null && elementType == JsonPresentationFields.PROPERTY) {

                     responseEnum = ActionStatus.PROPERTY_NOT_FOUND;
                 }
                 break;
                     responseEnum = ActionStatus.PROPERTY_NOT_FOUND;
                 }
                 break;


@@ -1384,6 +1226,9 @@ public class ComponentsUtils {
             case MISSING_ENTRY_SCHEMA_TYPE:
                 responseEnum = ActionStatus.INVALID_PROPERTY;
                 break;
             case MISSING_ENTRY_SCHEMA_TYPE:
                 responseEnum = ActionStatus.INVALID_PROPERTY;
                 break;

+            case INVALID_ATTRIBUTE_NAME:
+                responseEnum = ActionStatus.INVALID_ATTRIBUTE;
+                break;

             default:
                 responseEnum = ActionStatus.GENERAL_ERROR;
                 break;
             default:
                 responseEnum = ActionStatus.GENERAL_ERROR;
                 break;


@@ -1391,44 +1236,33 @@ public class ComponentsUtils {
         return responseEnum;
     }
 
         return responseEnum;
     }
 

-    public ResponseFormat getResponseFormatAdditionalProperty(ActionStatus actionStatus, AdditionalInfoParameterInfo additionalInfoParameterInfo, NodeTypeEnum nodeType, AdditionalInformationEnum labelOrValue) {
-
+    public ResponseFormat getResponseFormatAdditionalProperty(ActionStatus actionStatus, AdditionalInfoParameterInfo additionalInfoParameterInfo,
+                                                              NodeTypeEnum nodeType, AdditionalInformationEnum labelOrValue) {

         if (additionalInfoParameterInfo == null) {
             additionalInfoParameterInfo = new AdditionalInfoParameterInfo();
         }
         if (labelOrValue == null) {
             labelOrValue = AdditionalInformationEnum.None;
         }
         if (additionalInfoParameterInfo == null) {
             additionalInfoParameterInfo = new AdditionalInfoParameterInfo();
         }
         if (labelOrValue == null) {
             labelOrValue = AdditionalInformationEnum.None;
         }

-
-        ResponseFormat responseFormat = null;

         switch (actionStatus) {
             case COMPONENT_NAME_ALREADY_EXIST:
         switch (actionStatus) {
             case COMPONENT_NAME_ALREADY_EXIST:

-                responseFormat = getResponseFormat(actionStatus, "Additional parameter", additionalInfoParameterInfo.getKey());
-                break;
+                return getResponseFormat(actionStatus, "Additional parameter", additionalInfoParameterInfo.getKey());

             case ADDITIONAL_INFORMATION_EXCEEDS_LIMIT:
             case ADDITIONAL_INFORMATION_EXCEEDS_LIMIT:

-                responseFormat = getResponseFormat(actionStatus, labelOrValue.name().toLowerCase(), ValidationUtils.ADDITIONAL_INFORMATION_KEY_MAX_LENGTH.toString());
-                break;
+                return getResponseFormat(actionStatus, labelOrValue.name().toLowerCase(),
+                    ValidationUtils.ADDITIONAL_INFORMATION_KEY_MAX_LENGTH.toString());

             case ADDITIONAL_INFORMATION_MAX_NUMBER_REACHED:
             case ADDITIONAL_INFORMATION_MAX_NUMBER_REACHED:

-                responseFormat = getResponseFormat(actionStatus, nodeType.name().toLowerCase());
-                break;
+                return getResponseFormat(actionStatus, nodeType.name().toLowerCase());

             case ADDITIONAL_INFORMATION_EMPTY_STRING_NOT_ALLOWED:
             case ADDITIONAL_INFORMATION_EMPTY_STRING_NOT_ALLOWED:

-                responseFormat = getResponseFormat(actionStatus);
-                break;
+                return getResponseFormat(actionStatus);

             case ADDITIONAL_INFORMATION_KEY_NOT_ALLOWED_CHARACTERS:
             case ADDITIONAL_INFORMATION_KEY_NOT_ALLOWED_CHARACTERS:

-                responseFormat = getResponseFormat(actionStatus);
-                break;
+                return getResponseFormat(actionStatus);

             case ADDITIONAL_INFORMATION_VALUE_NOT_ALLOWED_CHARACTERS:
             case ADDITIONAL_INFORMATION_VALUE_NOT_ALLOWED_CHARACTERS:

-                responseFormat = getResponseFormat(actionStatus);
-                break;
+                return getResponseFormat(actionStatus);

             case ADDITIONAL_INFORMATION_NOT_FOUND:
             case ADDITIONAL_INFORMATION_NOT_FOUND:

-                responseFormat = getResponseFormat(actionStatus);
-                break;
+                return getResponseFormat(actionStatus);

             default:
             default:

-                responseFormat = getResponseFormat(actionStatus);
-                break;
+                return getResponseFormat(actionStatus);

         }
         }

-
-        return responseFormat;

     }
 
     public ResponseFormat getResponseFormatAdditionalProperty(ActionStatus actionStatus) {
     }
 
     public ResponseFormat getResponseFormatAdditionalProperty(ActionStatus actionStatus) {


@@ -1437,7 +1271,6 @@ public class ComponentsUtils {
 
     public ActionStatus convertFromStorageResponseForConsumer(StorageOperationStatus storageResponse) {
         ActionStatus responseEnum;
 
     public ActionStatus convertFromStorageResponseForConsumer(StorageOperationStatus storageResponse) {
         ActionStatus responseEnum;

-

         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;
         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;


@@ -1468,7 +1301,6 @@ public class ComponentsUtils {
 
     public ActionStatus convertFromStorageResponseForGroupType(StorageOperationStatus storageResponse) {
         ActionStatus responseEnum;
 
     public ActionStatus convertFromStorageResponseForGroupType(StorageOperationStatus storageResponse) {
         ActionStatus responseEnum;

-

         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;
         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;


@@ -1494,9 +1326,35 @@ public class ComponentsUtils {
         return responseEnum;
     }
 
         return responseEnum;
     }
 

-    public ActionStatus convertFromStorageResponseForDataType(StorageOperationStatus storageResponse) {
+    public ActionStatus convertFromStorageResponseForPolicyType(StorageOperationStatus storageResponse) {

         ActionStatus responseEnum;
         ActionStatus responseEnum;

+        switch (storageResponse) {
+            case OK:
+                responseEnum = ActionStatus.OK;
+                break;
+            case CONNECTION_FAILURE:
+            case GRAPH_IS_LOCK:
+                responseEnum = ActionStatus.GENERAL_ERROR;
+                break;
+            case BAD_REQUEST:
+                responseEnum = ActionStatus.INVALID_CONTENT;
+                break;
+            case ENTITY_ALREADY_EXISTS:
+                responseEnum = ActionStatus.POLICY_TYPE_ALREADY_EXIST;
+                break;
+            case SCHEMA_VIOLATION:
+                responseEnum = ActionStatus.POLICY_TYPE_ALREADY_EXIST;
+                break;
+            default:
+                responseEnum = ActionStatus.GENERAL_ERROR;
+                break;
+        }
+        log.debug(CONVERT_STORAGE_RESPONSE_TO_ACTION_RESPONSE, storageResponse, responseEnum);
+        return responseEnum;
+    }

 
 

+    public ActionStatus convertFromStorageResponseForDataType(StorageOperationStatus storageResponse) {
+        ActionStatus responseEnum;

         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;
         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;


@@ -1530,7 +1388,6 @@ public class ComponentsUtils {
             return getResponseFormat(actionStatus);
         }
         ResponseFormat responseFormat;
             return getResponseFormat(actionStatus);
         }
         ResponseFormat responseFormat;

-

         switch (actionStatus) {
             case GROUP_MEMBER_EMPTY:
             case GROUP_TYPE_ALREADY_EXIST:
         switch (actionStatus) {
             case GROUP_MEMBER_EMPTY:
             case GROUP_TYPE_ALREADY_EXIST:


@@ -1541,23 +1398,19 @@ public class ComponentsUtils {
                 break;
         }
         return responseFormat;
                 break;
         }
         return responseFormat;

-

     }
 
     public ResponseFormat getResponseFormatByPolicyType(ActionStatus actionStatus, PolicyTypeDefinition policyType) {
         if (policyType == null) {
             return getResponseFormat(actionStatus);
         }
     }
 
     public ResponseFormat getResponseFormatByPolicyType(ActionStatus actionStatus, PolicyTypeDefinition policyType) {
         if (policyType == null) {
             return getResponseFormat(actionStatus);
         }

-

         ResponseFormat responseFormat;
         if (actionStatus == ActionStatus.POLICY_TYPE_ALREADY_EXIST) {
             responseFormat = getResponseFormat(actionStatus, policyType.getType());
         ResponseFormat responseFormat;
         if (actionStatus == ActionStatus.POLICY_TYPE_ALREADY_EXIST) {
             responseFormat = getResponseFormat(actionStatus, policyType.getType());

-        }
-        else {
+        } else {

             responseFormat = getResponseFormat(actionStatus);
         }
         return responseFormat;
             responseFormat = getResponseFormat(actionStatus);
         }
         return responseFormat;

-

     }
 
     public ResponseFormat getResponseFormatByDataType(ActionStatus actionStatus, DataTypeDefinition dataType, List<String> properties) {
     }
 
     public ResponseFormat getResponseFormatByDataType(ActionStatus actionStatus, DataTypeDefinition dataType, List<String> properties) {


@@ -1565,7 +1418,6 @@ public class ComponentsUtils {
             return getResponseFormat(actionStatus);
         }
         ResponseFormat responseFormat;
             return getResponseFormat(actionStatus);
         }
         ResponseFormat responseFormat;

-

         switch (actionStatus) {
             case DATA_TYPE_ALREADY_EXIST:
                 responseFormat = getResponseFormat(actionStatus, dataType.getName());
         switch (actionStatus) {
             case DATA_TYPE_ALREADY_EXIST:
                 responseFormat = getResponseFormat(actionStatus, dataType.getName());


@@ -1594,7 +1446,6 @@ public class ComponentsUtils {
             case DATA_TYPE_CANNOT_BE_UPDATED_BAD_REQUEST:
                 responseFormat = getResponseFormat(actionStatus, dataType.getName());
                 break;
             case DATA_TYPE_CANNOT_BE_UPDATED_BAD_REQUEST:
                 responseFormat = getResponseFormat(actionStatus, dataType.getName());
                 break;

-

             default:
                 responseFormat = getResponseFormat(actionStatus);
                 break;
             default:
                 responseFormat = getResponseFormat(actionStatus);
                 break;


@@ -1623,9 +1474,8 @@ public class ComponentsUtils {
     }
 
     public ResponseFormat getResponseFormat(ComponentException exception) {
     }
 
     public ResponseFormat getResponseFormat(ComponentException exception) {

-        return exception instanceof ByResponseFormatComponentException ?
-            getResponseFormat((ByResponseFormatComponentException) exception):
-            getResponseFormat((ByActionStatusComponentException) exception);
+        return exception instanceof ByResponseFormatComponentException ? getResponseFormat((ByResponseFormatComponentException) exception)
+            : getResponseFormat((ByActionStatusComponentException) exception);

     }
 
     public ResponseFormat getResponseFormat(ByResponseFormatComponentException exception) {
     }
 
     public ResponseFormat getResponseFormat(ByResponseFormatComponentException exception) {


@@ -1636,10 +1486,8 @@ public class ComponentsUtils {
         return getResponseFormat(exception.getActionStatus(), exception.getParams());
     }
 
         return getResponseFormat(exception.getActionStatus(), exception.getParams());
     }
 

-    public ActionStatus convertFromStorageResponseForRelationshipType(
-            StorageOperationStatus storageResponse) {
+    public ActionStatus convertFromStorageResponseForRelationshipType(StorageOperationStatus storageResponse) {

         ActionStatus responseEnum;
         ActionStatus responseEnum;

-

         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;
         switch (storageResponse) {
             case OK:
                 responseEnum = ActionStatus.OK;


@@ -1670,93 +1518,35 @@ public class ComponentsUtils {
         return getResponseFormat(status, exception.getParams());
     }
 
         return getResponseFormat(status, exception.getParams());
     }
 

-

     public List<UiLeftPaletteComponent> convertComponentToUiLeftPaletteComponentObject(List<Component> components) {
         List<UiLeftPaletteComponent> uiLeftPaletteComponents = new ArrayList<>();
     public List<UiLeftPaletteComponent> convertComponentToUiLeftPaletteComponentObject(List<Component> components) {
         List<UiLeftPaletteComponent> uiLeftPaletteComponents = new ArrayList<>();

-        components.forEach(c-> uiLeftPaletteComponents.add(new UiLeftPaletteComponent(c)));
+        components.forEach(c -> uiLeftPaletteComponents.add(new UiLeftPaletteComponent(c)));

         return uiLeftPaletteComponents;
     }
 
         return uiLeftPaletteComponents;
     }
 

-    private static Set<String> getNodesFiltersToBeDeleted(final Component component,
-                                                         final String componentInstanceName) {
-        return component.getComponentInstances().stream()
-            .filter(ci -> isNodeFilterUsingChangedCi(ci, componentInstanceName))
-            .map(ComponentInstance::getName).collect(Collectors.toSet());
-    }
-    
-    public static Set<String> getNodesFiltersToBeDeleted(final Component component, 
-                                                         final ComponentInstance componentInstance) {
-        return getNodesFiltersToBeDeleted(component, componentInstance.getName());
-    }
-
-    private static boolean isNodeFilterUsingChangedCi(final ComponentInstance componentInstance, 
-                                                      final String componentInstanceName) {
-        if (CollectionUtils.isEmpty(componentInstance.getDirectives())) {
-            return false;
-        }
-        if (componentInstance.getNodeFilter() == null || componentInstance.getNodeFilter().getProperties() == null
-            || componentInstance.getNodeFilter().getProperties().getListToscaDataDefinition() == null) {
-            return false;
-        }
-        return componentInstance.getNodeFilter().getProperties().getListToscaDataDefinition().stream()
-            .anyMatch(property -> isPropertyConstraintChangedByCi(property, componentInstanceName));
-    }
-
-    private static boolean isPropertyConstraintChangedByCi(
-        final RequirementNodeFilterPropertyDataDefinition requirementNodeFilterPropertyDataDefinition, 
-        final String componentInstanceName) {
-        final List<String> constraints = requirementNodeFilterPropertyDataDefinition.getConstraints();
-        if (constraints == null) {
-            return false;
-        }
-        return constraints.stream().anyMatch(constraint -> isConstraintChangedByCi(constraint, componentInstanceName));
-    }
-
-    private static boolean isConstraintChangedByCi(final String constraint, 
-                                                   final String componentInstanceName) {
-        final UIConstraint uiConstraint = new ConstraintConvertor().convert(constraint);
-        if (uiConstraint == null || uiConstraint.getSourceType() == null) {
-            return false;
-        }
-        if (!uiConstraint.getSourceType().equals(ConstraintConvertor.PROPERTY_CONSTRAINT)) {
-            return false;
-        }
-        return uiConstraint.getSourceName().equals(componentInstanceName);
-    }
-

     public F<StorageOperationStatus, ResponseFormat> toResponseFormat() {
         return sos -> getResponseFormat(convertFromStorageResponse(sos));
     }
 
     public F<StorageOperationStatus, ResponseFormat> toResponseFormat() {
         return sos -> getResponseFormat(convertFromStorageResponse(sos));
     }
 

-
-    public Optional<UIConstraint> parseToConstraint(final String componentJson,
-                                                    final User user,
-                                                    final ComponentTypeEnum componentTypeEnum) {
-        final Either<UIConstraint, ResponseFormat> uiConstraintResponseFormatEither =
-            convertJsonToObjectUsingObjectMapper(componentJson, user, UIConstraint.class,
-                AuditingActionEnum.CREATE_RESOURCE, componentTypeEnum);
+    public Optional<UIConstraint> parseToConstraint(final String componentJson, final User user, final ComponentTypeEnum componentTypeEnum) {
+        final Either<UIConstraint, ResponseFormat> uiConstraintResponseFormatEither = convertJsonToObjectUsingObjectMapper(componentJson, user,
+            UIConstraint.class, AuditingActionEnum.CREATE_RESOURCE, componentTypeEnum);

         if (uiConstraintResponseFormatEither.isRight()) {
             return Optional.empty();
         }
         return Optional.of(uiConstraintResponseFormatEither.left().value());
     }
 
         if (uiConstraintResponseFormatEither.isRight()) {
             return Optional.empty();
         }
         return Optional.of(uiConstraintResponseFormatEither.left().value());
     }
 

-    private Either<List, ResponseFormat> parseToConstraints(final String componentJson,
-                                                           final User user,
-                                                           final ComponentTypeEnum componentTypeEnum) {
-        return convertJsonToObjectUsingObjectMapper(componentJson, user, List.class, AuditingActionEnum.CREATE_RESOURCE,
-            componentTypeEnum);
+    private Either<List, ResponseFormat> parseToConstraints(final String componentJson, final User user, final ComponentTypeEnum componentTypeEnum) {
+        return convertJsonToObjectUsingObjectMapper(componentJson, user, List.class, AuditingActionEnum.CREATE_RESOURCE, componentTypeEnum);

     }
 
     }
 

-    public List<UIConstraint> validateAndParseConstraint(final ComponentTypeEnum componentTypeEnum,
-                                                         final String constraintData,
+    public List<UIConstraint> validateAndParseConstraint(final ComponentTypeEnum componentTypeEnum, final String constraintData,

                                                          final User userModifier) {
                                                          final User userModifier) {

-

         final String FAILED_TO_PARSE_CONSTRAINT_DATA = "Failed to Parse Constraint Data {}";
         final Either<List, ResponseFormat> convertResponse = parseToConstraints(constraintData, userModifier, componentTypeEnum);
         if (convertResponse.isRight()) {
         final String FAILED_TO_PARSE_CONSTRAINT_DATA = "Failed to Parse Constraint Data {}";
         final Either<List, ResponseFormat> convertResponse = parseToConstraints(constraintData, userModifier, componentTypeEnum);
         if (convertResponse.isRight()) {

-            log.error(EcompLoggerErrorCode.DATA_ERROR, FAILED_TO_PARSE_CONSTRAINT_DATA, constraintData,
-                convertResponse.right().value());
+            log.error(EcompLoggerErrorCode.DATA_ERROR, FAILED_TO_PARSE_CONSTRAINT_DATA, constraintData, convertResponse.right().value());

             return Collections.emptyList();
         }
         final List<Map<String, String>> uiConstraintsMaps = (List<Map<String, String>>) convertResponse.left().value();
             return Collections.emptyList();
         }
         final List<Map<String, String>> uiConstraintsMaps = (List<Map<String, String>>) convertResponse.left().value();


@@ -1764,10 +1554,50 @@ public class ComponentsUtils {
             log.error(EcompLoggerErrorCode.DATA_ERROR, FAILED_TO_PARSE_CONSTRAINT_DATA, constraintData);
             return Collections.emptyList();
         }
             log.error(EcompLoggerErrorCode.DATA_ERROR, FAILED_TO_PARSE_CONSTRAINT_DATA, constraintData);
             return Collections.emptyList();
         }

+        return uiConstraintsMaps.stream().map(dataMap -> new com.fasterxml.jackson.databind.ObjectMapper().convertValue(dataMap, UIConstraint.class))
+            .collect(Collectors.toList());
+    }

 
 

-        return uiConstraintsMaps.stream().map(dataMap -> new com.fasterxml.jackson.databind.ObjectMapper()
-            .convertValue(dataMap, UIConstraint.class)).collect(Collectors.toList());
+    public Map<String, DataTypeDefinition> getAllDataTypes(final ApplicationDataTypeCache applicationDataTypeCache, final String model) {
+        final Either<Map<String, DataTypeDefinition>, JanusGraphOperationStatus> allDataTypes = applicationDataTypeCache.getAll(model);
+        if (allDataTypes.isRight()) {
+            final var operationStatus = allDataTypes.right().value();
+            if (operationStatus == JanusGraphOperationStatus.NOT_FOUND) {
+                BeEcompErrorManager.getInstance().logInternalDataError("FetchDataTypes", "Data types are not loaded", ErrorSeverity.ERROR);
+                throw new ByActionStatusComponentException(ActionStatus.DATA_TYPES_NOT_LOADED, model);
+            } else {
+                BeEcompErrorManager.getInstance().logInternalFlowError("FetchDataTypes", "Failed to fetch data types", ErrorSeverity.ERROR);
+                throw new ByActionStatusComponentException(ActionStatus.GENERAL_ERROR);
+            }
+        }
+        return allDataTypes.left().value();

     }
 
     }
 

+    public ActionStatus convertFromStorageResponseForArtifactType(final StorageOperationStatus storageResponse) {
+        ActionStatus responseEnum;
+        switch (storageResponse) {
+            case OK:
+                responseEnum = ActionStatus.OK;
+                break;
+            case CONNECTION_FAILURE:
+            case GRAPH_IS_LOCK:
+                responseEnum = ActionStatus.GENERAL_ERROR;
+                break;
+            case BAD_REQUEST:
+                responseEnum = ActionStatus.INVALID_CONTENT;
+                break;
+            case ENTITY_ALREADY_EXISTS:
+                responseEnum = ActionStatus.ARTIFACT_TYPE_ALREADY_EXIST;
+                break;
+            case SCHEMA_VIOLATION:
+                responseEnum = ActionStatus.ARTIFACT_TYPE_ALREADY_EXIST;
+                break;
+            default:
+                responseEnum = ActionStatus.GENERAL_ERROR;
+                break;
+        }
+        log.debug(CONVERT_STORAGE_RESPONSE_TO_ACTION_RESPONSE, storageResponse, responseEnum);
+        return responseEnum;
+    }

 
 }
 
 }