Merge "Corrected enum formatting by plugin"

23 files changed, 435 insertions, 109 deletions

diff --git a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vdu/VduStateType.java b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vdu/VduStateType.java
index 8870f5c7b5..d20e0494ae 100644
--- a/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vdu/VduStateType.java
+++ b/adapters/mso-adapters-rest-interface/src/main/java/org/onap/so/adapters/vdu/VduStateType.java
@@ -25,7 +25,13 @@ package org.onap.so.adapters.vdu;
  * Enum status values to capture the state of a generic (cloud-agnostic) VDU.
  */
 public enum VduStateType {
-    NOTFOUND, INSTANTIATING, INSTANTIATED, DELETING, DELETED, // Note - only returned in success response to deleteVdu
-                                                              // call.
-    UPDATING, FAILED, UNKNOWN
+    NOTFOUND,
+    INSTANTIATING,
+    INSTANTIATED,
+    DELETING,
+    DELETED, // Note - only returned in success response to deleteVdu
+             // call.
+    UPDATING,
+    FAILED,
+    UNKNOWN
 }
diff --git a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/vdu/utils/VduStatus.java b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/vdu/utils/VduStatus.java
index 0c4b9e01b9..66b2e52570 100644
--- a/adapters/mso-openstack-adapters/src/main/java/org/onap/so/vdu/utils/VduStatus.java
+++ b/adapters/mso-openstack-adapters/src/main/java/org/onap/so/vdu/utils/VduStatus.java
@@ -25,8 +25,14 @@ package org.onap.so.vdu.utils;
  * Enum status values to capture the state of a generic (cloud-agnostic) VDU.
  */
 public enum VduStatus {
-    NOTFOUND, INSTANTIATING, INSTANTIATED, DELETING, DELETED, // Note - only returned in success response to deleteVdu
-                                                              // call.
-    UPDATING, FAILED, UNKNOWN
+    NOTFOUND,
+    INSTANTIATING,
+    INSTANTIATED,
+    DELETING,
+    DELETED, // Note - only returned in success response to deleteVdu
+             // call.
+    UPDATING,
+    FAILED,
+    UNKNOWN
 }
 
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ResourceKey.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ResourceKey.java
index 9e95e79b70..8608fee244 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ResourceKey.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/entities/ResourceKey.java
@@ -21,5 +21,15 @@
 package org.onap.so.bpmn.servicedecomposition.entities;
 
 public enum ResourceKey {
-    SERVICE_INSTANCE_ID, GENERIC_VNF_ID, NETWORK_ID, VOLUME_GROUP_ID, VF_MODULE_ID, ALLOTTED_RESOURCE_ID, CONFIGURATION_ID, NETWORK_COLLECTION_ID, VPN_ID, VPN_BONDING_LINK_ID, INSTANCE_GROUP_ID;
+    SERVICE_INSTANCE_ID,
+    GENERIC_VNF_ID,
+    NETWORK_ID,
+    VOLUME_GROUP_ID,
+    VF_MODULE_ID,
+    ALLOTTED_RESOURCE_ID,
+    CONFIGURATION_ID,
+    NETWORK_COLLECTION_ID,
+    VPN_ID,
+    VPN_BONDING_LINK_ID,
+    INSTANCE_GROUP_ID;
 }
diff --git a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/AssignFlows.java b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/AssignFlows.java
index 7ca6076b21..2d6ce0fad7 100644
--- a/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/AssignFlows.java
+++ b/bpmn/MSOCommonBPMN/src/main/java/org/onap/so/bpmn/servicedecomposition/tasks/AssignFlows.java
@@ -22,10 +22,14 @@ package org.onap.so.bpmn.servicedecomposition.tasks;
 
 public enum AssignFlows {
 
-    SERVICE_INSTANCE("AssignServiceInstanceBB"), VNF("AssignVnfBB"), VF_MODULE("AssignVfModuleBB"), NETWORK_A_LA_CARTE(
-            "AssignNetwork1802BB"), NETWORK_MACRO("AssignNetworkBB"), VOLUME_GROUP(
-                    "AssignVolumeGroupBB"), NETWORK_COLLECTION(
-                            "CreateNetworkCollectionBB"), FABRIC_CONFIGURATION("AssignFabricConfigurationBB");
+    SERVICE_INSTANCE("AssignServiceInstanceBB"),
+    VNF("AssignVnfBB"),
+    VF_MODULE("AssignVfModuleBB"),
+    NETWORK_A_LA_CARTE("AssignNetwork1802BB"),
+    NETWORK_MACRO("AssignNetworkBB"),
+    VOLUME_GROUP("AssignVolumeGroupBB"),
+    NETWORK_COLLECTION("CreateNetworkCollectionBB"),
+    FABRIC_CONFIGURATION("AssignFabricConfigurationBB");
 
     private final String flowName;
 
diff --git a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilder.java b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilder.java
index 21b14c35f9..2418479da6 100644
--- a/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilder.java
+++ b/bpmn/so-bpmn-infrastructure-common/src/main/java/org/onap/so/bpmn/infrastructure/workflow/serviceTask/client/builder/AbstractBuilder.java
@@ -38,31 +38,23 @@ public abstract class AbstractBuilder<I, O> {
     public static final String RESOURCE_TYPE = "resourceType";
 
     public enum RequestAction {
-        CREATE_NETWORK_INSTANCE(0, "CreateNetworkInstance"), ACTIVATE_NETWORK_INSTANCE(1,
-                "ActivateNetworkInstance"), CREATE_SERVICE_INSTANCE(2,
-                        "CreateServiceInstance"), DELETE_SERVICE_INSTANCE(3,
-                                "DeleteServiceInstance"), DELETE_NETWORK_INSTANCE(4,
-                                        "DeleteNetworkInstance"), CREATE_VNF_INSTANCE(5,
-                                                "CreateVnfInstance"), ACTIVATE_VNF_INSTANCE(6,
-                                                        "ActivateVnfInstance"), DELETE_VNF_INSTANCE(7,
-                                                                "DeleteVnfInstance"), CREATE_VF_MODULE_INSTANCE(8,
-                                                                        "CreateVfModuleInstance"), ACTIVATE_VF_MODULE_INSTANCE(
-                                                                                9,
-                                                                                "ActivateVfModuleInstance"), DELETE_VF_MODULE_INSTANCE(
-                                                                                        10,
-                                                                                        "DeleteVfModuleInstance"), CREATE_CONTRAIL_ROUTE_INSTANCE(
-                                                                                                11,
-                                                                                                "CreateContrailRouteInstance"), DELETE_CONTRAIL_ROUTE_INSTANCE(
-                                                                                                        12,
-                                                                                                        "DeleteContrailRouteInstance"), CREATE_SECURITY_ZONE_INSTANCE(
-                                                                                                                13,
-                                                                                                                "CreateSecurityZoneInstance"), DELETE_SECURITY_ZONE_INSTANCE(
-                                                                                                                        14,
-                                                                                                                        "DeleteSecurityZoneInstance"), ACTIVATE_DCI_NETWORK_INSTANCE(
-                                                                                                                                15,
-                                                                                                                                "ActivateDCINetworkInstance"), DEACTIVATE_DCI_NETWORK_INSTANCE(
-                                                                                                                                        16,
-                                                                                                                                        "DeActivateDCINetworkInstance");
+        CREATE_NETWORK_INSTANCE(0, "CreateNetworkInstance"),
+        ACTIVATE_NETWORK_INSTANCE(1, "ActivateNetworkInstance"),
+        CREATE_SERVICE_INSTANCE(2, "CreateServiceInstance"),
+        DELETE_SERVICE_INSTANCE(3, "DeleteServiceInstance"),
+        DELETE_NETWORK_INSTANCE(4, "DeleteNetworkInstance"),
+        CREATE_VNF_INSTANCE(5, "CreateVnfInstance"),
+        ACTIVATE_VNF_INSTANCE(6, "ActivateVnfInstance"),
+        DELETE_VNF_INSTANCE(7, "DeleteVnfInstance"),
+        CREATE_VF_MODULE_INSTANCE(8, "CreateVfModuleInstance"),
+        ACTIVATE_VF_MODULE_INSTANCE(9, "ActivateVfModuleInstance"),
+        DELETE_VF_MODULE_INSTANCE(10, "DeleteVfModuleInstance"),
+        CREATE_CONTRAIL_ROUTE_INSTANCE(11, "CreateContrailRouteInstance"),
+        DELETE_CONTRAIL_ROUTE_INSTANCE(12, "DeleteContrailRouteInstance"),
+        CREATE_SECURITY_ZONE_INSTANCE(13, "CreateSecurityZoneInstance"),
+        DELETE_SECURITY_ZONE_INSTANCE(14, "DeleteSecurityZoneInstance"),
+        ACTIVATE_DCI_NETWORK_INSTANCE(15, "ActivateDCINetworkInstance"),
+        DEACTIVATE_DCI_NETWORK_INSTANCE(16, "DeActivateDCINetworkInstance");
 
         String name;
         int value;
@@ -82,9 +74,16 @@ public abstract class AbstractBuilder<I, O> {
     }
 
     public enum SvcAction {
-        RESERVE(0, "reserve"), ASSIGN(1, "assign"), ACTIVATE(2, "activate"), DELETE(3, "delete"), CHANGEASSIGN(4,
-                "changeassign"), CHANGEDELETE(5, "changedelete"), ROLLBACK(6,
-                        "rollback"), DEACTIVATE(7, "deactivate"), UNASSIGN(8, "unassign"), CREATE(9, "create");
+        RESERVE(0, "reserve"),
+        ASSIGN(1, "assign"),
+        ACTIVATE(2, "activate"),
+        DELETE(3, "delete"),
+        CHANGEASSIGN(4, "changeassign"),
+        CHANGEDELETE(5, "changedelete"),
+        ROLLBACK(6, "rollback"),
+        DEACTIVATE(7, "deactivate"),
+        UNASSIGN(8, "unassign"),
+        CREATE(9, "create");
 
         String name;
         int value;
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowType.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowType.java
index af8f93b92b..05a51797dd 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowType.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/bpmn/infrastructure/workflow/tasks/WorkflowType.java
@@ -22,9 +22,15 @@ package org.onap.so.bpmn.infrastructure.workflow.tasks;
 
 public enum WorkflowType {
 
-    SERVICE("Service"), VNF("Vnf"), VFMODULE("VfModule"), VOLUMEGROUP("VolumeGroup"), NETWORK("Network"), VIRTUAL_LINK(
-            "VirtualLink"), NETWORKCOLLECTION(
-                    "NetworkCollection"), CONFIGURATION("Configuration"), INSTANCE_GROUP("InstanceGroup");
+    SERVICE("Service"),
+    VNF("Vnf"),
+    VFMODULE("VfModule"),
+    VOLUMEGROUP("VolumeGroup"),
+    NETWORK("Network"),
+    VIRTUAL_LINK("VirtualLink"),
+    NETWORKCOLLECTION("NetworkCollection"),
+    CONFIGURATION("Configuration"),
+    INSTANCE_GROUP("InstanceGroup");
 
     private final String type;
 
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcAction.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcAction.java
index 1718de9fe0..d6216c509d 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcAction.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcAction.java
@@ -23,22 +23,17 @@ package org.onap.so.client.sdnc.beans;
 import org.onap.sdnc.northbound.client.model.GenericResourceApiSvcActionEnumeration;
 
 public enum SDNCSvcAction {
-    ACTIVATE("activate", GenericResourceApiSvcActionEnumeration.ACTIVATE), DELETE("delete",
-            GenericResourceApiSvcActionEnumeration.DELETE), ASSIGN("assign",
-                    GenericResourceApiSvcActionEnumeration.ASSIGN), ROLLBACK("rollback",
-                            GenericResourceApiSvcActionEnumeration.ROLLBACK), UNASSIGN("unassign",
-                                    GenericResourceApiSvcActionEnumeration.UNASSIGN), DEACTIVATE("deactivate",
-                                            GenericResourceApiSvcActionEnumeration.DEACTIVATE), CHANGE_DELETE(
-                                                    "changedelete",
-                                                    GenericResourceApiSvcActionEnumeration.CHANGEDELETE), CHANGE_ASSIGN(
-                                                            "changeassign",
-                                                            GenericResourceApiSvcActionEnumeration.CHANGEASSIGN), CREATE(
-                                                                    "create",
-                                                                    GenericResourceApiSvcActionEnumeration.CREATE), ENABLE(
-                                                                            "enable",
-                                                                            GenericResourceApiSvcActionEnumeration.ENABLE), DISABLE(
-                                                                                    "disable",
-                                                                                    GenericResourceApiSvcActionEnumeration.DISABLE);
+    ACTIVATE("activate", GenericResourceApiSvcActionEnumeration.ACTIVATE),
+    DELETE("delete", GenericResourceApiSvcActionEnumeration.DELETE),
+    ASSIGN("assign", GenericResourceApiSvcActionEnumeration.ASSIGN),
+    ROLLBACK("rollback", GenericResourceApiSvcActionEnumeration.ROLLBACK),
+    UNASSIGN("unassign", GenericResourceApiSvcActionEnumeration.UNASSIGN),
+    DEACTIVATE("deactivate", GenericResourceApiSvcActionEnumeration.DEACTIVATE),
+    CHANGE_DELETE("changedelete", GenericResourceApiSvcActionEnumeration.CHANGEDELETE),
+    CHANGE_ASSIGN("changeassign", GenericResourceApiSvcActionEnumeration.CHANGEASSIGN),
+    CREATE("create", GenericResourceApiSvcActionEnumeration.CREATE),
+    ENABLE("enable", GenericResourceApiSvcActionEnumeration.ENABLE),
+    DISABLE("disable", GenericResourceApiSvcActionEnumeration.DISABLE);
 
     private final String name;
 
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcOperation.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcOperation.java
index b9b04bc7b7..4edbf37bad 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcOperation.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/beans/SDNCSvcOperation.java
@@ -22,14 +22,14 @@ package org.onap.so.client.sdnc.beans;
 
 public enum SDNCSvcOperation {
 
-    VF_MODULE_TOPOLOGY_OPERATION("vf-module-topology-operation"), NETWORK_TOPOLOGY_OPERATION(
-            "network-topology-operation"), VNF_TOPOLOGY_OPERATION(
-                    "vnf-topology-operation"), CONTRAIL_ROUTE_TOPOLOGY_OPERATION(
-                            "contrail-route-topology-operation"), SECURITY_ZONE_TOPOLOGY_OPERATION(
-                                    "security-zone-topology-operation"), PORT_MIRROR_TOPOLOGY_OPERATION(
-                                            "port-mirror-topology-operation"), SERVICE_TOPOLOGY_OPERATION(
-                                                    "service-topology-operation"), GENERIC_CONFIGURATION_TOPOLOGY_OPERATION(
-                                                            "generic-configuration-topology-operation");
+    VF_MODULE_TOPOLOGY_OPERATION("vf-module-topology-operation"),
+    NETWORK_TOPOLOGY_OPERATION("network-topology-operation"),
+    VNF_TOPOLOGY_OPERATION("vnf-topology-operation"),
+    CONTRAIL_ROUTE_TOPOLOGY_OPERATION("contrail-route-topology-operation"),
+    SECURITY_ZONE_TOPOLOGY_OPERATION("security-zone-topology-operation"),
+    PORT_MIRROR_TOPOLOGY_OPERATION("port-mirror-topology-operation"),
+    SERVICE_TOPOLOGY_OPERATION("service-topology-operation"),
+    GENERIC_CONFIGURATION_TOPOLOGY_OPERATION("generic-configuration-topology-operation");
 
     private final String name;
 
diff --git a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/endpoint/SDNCTopology.java b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/endpoint/SDNCTopology.java
index fb5f24694b..ae9fe6ad70 100644
--- a/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/endpoint/SDNCTopology.java
+++ b/bpmn/so-bpmn-tasks/src/main/java/org/onap/so/client/sdnc/endpoint/SDNCTopology.java
@@ -22,11 +22,14 @@ package org.onap.so.client.sdnc.endpoint;
 
 public enum SDNCTopology {
 
-    SERVICE("service-topology-operation"), VNF("vnf-topology-operation"), VFMODULE(
-            "vf-module-topology-operation"), CONTRAILROUTE("contrail-route-topology-operation"), PORTMIRROR(
-                    "port-mirror-topology-operation"), NETWORK("network-topology-operation"), SECURITYZONE(
-                            "security-zone-topology-operation"), CONFIGURATION(
-                                    "generic-configuration-topology-operation");
+    SERVICE("service-topology-operation"),
+    VNF("vnf-topology-operation"),
+    VFMODULE("vf-module-topology-operation"),
+    CONTRAILROUTE("contrail-route-topology-operation"),
+    PORTMIRROR("port-mirror-topology-operation"),
+    NETWORK("network-topology-operation"),
+    SECURITYZONE("security-zone-topology-operation"),
+    CONFIGURATION("generic-configuration-topology-operation");
 
     private final String topology;
 
diff --git a/common/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java b/common/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java
index 2e70c4925a..456f14e5ee 100644
--- a/common/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java
+++ b/common/src/main/java/org/onap/so/client/aai/entities/AAIEdgeLabel.java
@@ -24,8 +24,9 @@ import org.onap.so.client.graphinventory.entities.GraphInventoryEdgeLabel;
 
 public enum AAIEdgeLabel implements GraphInventoryEdgeLabel {
 
-    BELONGS_TO("org.onap.relationships.inventory.BelongsTo"), USES(
-            "org.onap.relationships.inventory.Uses"), COMPOSED_OF("org.onap.relationships.inventory.ComposedOf");
+    BELONGS_TO("org.onap.relationships.inventory.BelongsTo"),
+    USES("org.onap.relationships.inventory.Uses"),
+    COMPOSED_OF("org.onap.relationships.inventory.ComposedOf");
 
     private final String label;
 
diff --git a/common/src/main/java/org/onap/so/client/graphinventory/Format.java b/common/src/main/java/org/onap/so/client/graphinventory/Format.java
index b422516e63..c3cb4b9eaf 100644
--- a/common/src/main/java/org/onap/so/client/graphinventory/Format.java
+++ b/common/src/main/java/org/onap/so/client/graphinventory/Format.java
@@ -22,8 +22,14 @@ package org.onap.so.client.graphinventory;
 
 public enum Format {
 
-    RESOURCE("resource"), RESOURCE_AND_URL("resource_and_url"), SIMPLE("simple"), RAW("raw"), CONSOLE(
-            "console"), PATHED("pathed"), GRAPHSON("graphson"), ID("id");
+    RESOURCE("resource"),
+    RESOURCE_AND_URL("resource_and_url"),
+    SIMPLE("simple"),
+    RAW("raw"),
+    CONSOLE("console"),
+    PATHED("pathed"),
+    GRAPHSON("graphson"),
+    ID("id");
 
     private final String name;
 
diff --git a/common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java b/common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java
index b00d22dbad..eb95b75593 100644
--- a/common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java
+++ b/common/src/main/java/org/onap/so/client/policy/entities/PolicyServiceType.java
@@ -21,11 +21,18 @@
 package org.onap.so.client.policy.entities;
 
 public enum PolicyServiceType {
-    GET_CONFIG("getConfig"), SEND_EVENT("sendEvent"), PUSH_POLICY("pushPolicy"), CREATE_POLICY(
-            "createPolicy"), UPDATE_POLICY("updatePolicy"), GET_DECISION("getDecision"), GET_METRICS(
-                    "getMetrics"), DELETE_POLICY("deletePolicy"), LIST_CONFIG("listConfig"), CREATE_DICTIONARY_ITEM(
-                            "createDictionaryItem"), UPDATE_DICTIONARY_ITEM(
-                                    "updateDictionaryItem"), GET_DICTIONARY_ITEMS("getDictionaryItems");
+    GET_CONFIG("getConfig"),
+    SEND_EVENT("sendEvent"),
+    PUSH_POLICY("pushPolicy"),
+    CREATE_POLICY("createPolicy"),
+    UPDATE_POLICY("updatePolicy"),
+    GET_DECISION("getDecision"),
+    GET_METRICS("getMetrics"),
+    DELETE_POLICY("deletePolicy"),
+    LIST_CONFIG("listConfig"),
+    CREATE_DICTIONARY_ITEM("createDictionaryItem"),
+    UPDATE_DICTIONARY_ITEM("updateDictionaryItem"),
+    GET_DICTIONARY_ITEMS("getDictionaryItems");
 
     private final String name;
 
diff --git a/common/src/main/java/org/onap/so/logger/ErrorCode.java b/common/src/main/java/org/onap/so/logger/ErrorCode.java
index 2d6fb791d5..f0a78e9699 100644
--- a/common/src/main/java/org/onap/so/logger/ErrorCode.java
+++ b/common/src/main/java/org/onap/so/logger/ErrorCode.java
@@ -1,8 +1,12 @@
 package org.onap.so.logger;
 
 public enum ErrorCode {
-    PermissionError(100), AvailabilityError(200), DataError(300), SchemaError(400), BusinessProcesssError(
-            500), UnknownError(900);
+    PermissionError(100),
+    AvailabilityError(200),
+    DataError(300),
+    SchemaError(400),
+    BusinessProcesssError(500),
+    UnknownError(900);
 
     private int value;
 
diff --git a/common/src/main/java/org/onap/so/logger/MessageEnum.java b/common/src/main/java/org/onap/so/logger/MessageEnum.java
index e92d50a685..bcf699beaf 100644
--- a/common/src/main/java/org/onap/so/logger/MessageEnum.java
+++ b/common/src/main/java/org/onap/so/logger/MessageEnum.java
@@ -24,13 +24,200 @@ package org.onap.so.logger;
 
 public enum MessageEnum {
     // Api Handler Messages
-    APIH_REQUEST_NULL, APIH_QUERY_FOUND, APIH_QUERY_NOT_FOUND, APIH_QUERY_PARAM_WRONG, APIH_DB_ACCESS_EXC, APIH_DB_ACCESS_EXC_REASON, APIH_VALIDATION_ERROR, APIH_REQUEST_VALIDATION_ERROR, APIH_SERVICE_VALIDATION_ERROR, APIH_GENERAL_EXCEPTION_ARG, APIH_GENERAL_EXCEPTION, APIH_GENERAL_WARNING, APIH_AUDIT_EXEC, APIH_GENERAL_METRICS, APIH_DUPLICATE_CHECK_EXC, APIH_DUPLICATE_FOUND, APIH_BAD_ORDER, APIH_DB_ATTRIBUTE_NOT_FOUND, APIH_BPEL_COMMUNICATE_ERROR, APIH_BPEL_RESPONSE_ERROR, APIH_WARP_REQUEST, APIH_ERROR_FROM_BPEL_SERVER, APIH_DB_INSERT_EXC, APIH_DB_UPDATE_EXC, APIH_NO_PROPERTIES, APIH_PROPERTY_LOAD_SUC, APIH_LOAD_PROPERTIES_FAIL, APIH_SDNC_COMMUNICATE_ERROR, APIH_SDNC_RESPONSE_ERROR, APIH_CANNOT_READ_SCHEMA, APIH_HEALTH_CHECK_EXCEPTION, APIH_REQUEST_VALIDATION_ERROR_REASON, APIH_JAXB_MARSH_ERROR, APIH_JAXB_UNMARSH_ERROR, APIH_VNFREQUEST_VALIDATION_ERROR, APIH_DOM2STR_ERROR, APIH_READ_VNFOUTPUT_CLOB_EXCEPTION, APIH_DUPLICATE_CHECK_EXC_ATT, APIH_GENERATED_REQUEST_ID, APIH_GENERATED_SERVICE_INSTANCE_ID, APIH_REPLACE_REQUEST_ID,
+    APIH_REQUEST_NULL,
+    APIH_QUERY_FOUND,
+    APIH_QUERY_NOT_FOUND,
+    APIH_QUERY_PARAM_WRONG,
+    APIH_DB_ACCESS_EXC,
+    APIH_DB_ACCESS_EXC_REASON,
+    APIH_VALIDATION_ERROR,
+    APIH_REQUEST_VALIDATION_ERROR,
+    APIH_SERVICE_VALIDATION_ERROR,
+    APIH_GENERAL_EXCEPTION_ARG,
+    APIH_GENERAL_EXCEPTION,
+    APIH_GENERAL_WARNING,
+    APIH_AUDIT_EXEC,
+    APIH_GENERAL_METRICS,
+    APIH_DUPLICATE_CHECK_EXC,
+    APIH_DUPLICATE_FOUND,
+    APIH_BAD_ORDER,
+    APIH_DB_ATTRIBUTE_NOT_FOUND,
+    APIH_BPEL_COMMUNICATE_ERROR,
+    APIH_BPEL_RESPONSE_ERROR,
+    APIH_WARP_REQUEST,
+    APIH_ERROR_FROM_BPEL_SERVER,
+    APIH_DB_INSERT_EXC,
+    APIH_DB_UPDATE_EXC,
+    APIH_NO_PROPERTIES,
+    APIH_PROPERTY_LOAD_SUC,
+    APIH_LOAD_PROPERTIES_FAIL,
+    APIH_SDNC_COMMUNICATE_ERROR,
+    APIH_SDNC_RESPONSE_ERROR,
+    APIH_CANNOT_READ_SCHEMA,
+    APIH_HEALTH_CHECK_EXCEPTION,
+    APIH_REQUEST_VALIDATION_ERROR_REASON,
+    APIH_JAXB_MARSH_ERROR,
+    APIH_JAXB_UNMARSH_ERROR,
+    APIH_VNFREQUEST_VALIDATION_ERROR,
+    APIH_DOM2STR_ERROR,
+    APIH_READ_VNFOUTPUT_CLOB_EXCEPTION,
+    APIH_DUPLICATE_CHECK_EXC_ATT,
+    APIH_GENERATED_REQUEST_ID,
+    APIH_GENERATED_SERVICE_INSTANCE_ID,
+    APIH_REPLACE_REQUEST_ID,
     // Resource Adapter Messages
-    RA_GENERAL_EXCEPTION_ARG, RA_GENERAL_EXCEPTION, RA_GENERAL_WARNING, RA_MISSING_PARAM, RA_AUDIT_EXEC, RA_GENERAL_METRICS, RA_CREATE_STACK_TIMEOUT, RA_DELETE_STACK_TIMEOUT, RA_UPDATE_STACK_TIMEOUT, RA_CONNECTION_EXCEPTION, RA_PARSING_ERROR, RA_PROPERTIES_NOT_FOUND, RA_LOAD_PROPERTIES_SUC, RA_NETWORK_ALREADY_EXIST, RA_UPDATE_NETWORK_ERR, RA_CREATE_STACK_ERR, RA_UPDATE_STACK_ERR, RA_CREATE_TENANT_ERR, RA_NETWORK_NOT_FOUND, RA_NETWORK_ORCHE_MODE_NOT_SUPPORT, RA_CREATE_NETWORK_EXC, RA_NS_EXC, RA_PARAM_NOT_FOUND, RA_CONFIG_EXC, RA_UNKOWN_PARAM, RA_VLAN_PARSE, RA_DELETE_NETWORK_EXC, RA_ROLLBACK_NULL, RA_TENANT_NOT_FOUND, RA_QUERY_NETWORK_EXC, RA_CREATE_NETWORK_NOTIF_EXC, RA_ASYNC_ROLLBACK, RA_WSDL_NOT_FOUND, RA_WSDL_URL_CONVENTION_EXC, RA_INIT_NOTIF_EXC, RA_SET_CALLBACK_AUTH_EXC, RA_FAULT_INFO_EXC, RA_MARSHING_ERROR, RA_PARSING_REQUEST_ERROR, RA_SEND_REQUEST_SDNC, RA_RESPONSE_FROM_SDNC, RA_EXCEPTION_COMMUNICATE_SDNC, RA_EVALUATE_XPATH_ERROR, RA_ANALYZE_ERROR_EXC, RA_ERROR_GET_RESPONSE_SDNC, RA_CALLBACK_BPEL, RA_INIT_CALLBACK_WSDL_ERR, RA_CALLBACK_BPEL_EXC, RA_CALLBACK_BPEL_COMPLETE, RA_SDNC_MISS_CONFIG_PARAM, RA_SDNC_INVALID_CONFIG, RA_PRINT_URL, RA_ERROR_CREATE_SDNC_REQUEST, RA_ERROR_CREATE_SDNC_RESPONSE, RA_ERROR_CONVERT_XML2STR, RA_RECEIVE_SDNC_NOTIF, RA_INIT_SDNC_ADAPTER, RA_SEND_REQUEST_APPC_ERR, RA_SEND_REQUEST_SDNC_ERR, RA_RECEIVE_BPEL_REQUEST, RA_TENANT_ALREADY_EXIST, RA_UPDATE_TENANT_ERR, RA_DELETE_TEMAMT_ERR, RA_ROLLBACK_TENANT_ERR, RA_QUERY_VNF_ERR, RA_VNF_ALREADY_EXIST, RA_VNF_UNKNOWN_PARAM, RA_VNF_EXTRA_PARAM, RA_CREATE_VNF_ERR, RA_VNF_NOT_EXIST, RA_UPDATE_VNF_ERR, RA_DELETE_VNF_ERR, RA_ASYNC_CREATE_VNF, RA_SEND_VNF_NOTIF_ERR, RA_ASYNC_CREATE_VNF_COMPLETE, RA_ASYNC_UPDATE_VNF, RA_ASYNC_UPDATE_VNF_COMPLETE, RA_ASYNC_QUERY_VNF, RA_ASYNC_QUERY_VNF_COMPLETE, RA_ASYNC_DELETE_VNF, RA_ASYNC_DELETE_VNF_COMPLETE, RA_ASYNC_ROLLBACK_VNF, RA_ASYNC_ROLLBACK_VNF_COMPLETE, RA_ROLLBACK_VNF_ERR, RA_DB_INVALID_STATUS, RA_CANT_UPDATE_REQUEST, RA_DB_REQUEST_NOT_EXIST, RA_CONFIG_NOT_FOUND, RA_CONFIG_LOAD, RA_RECEIVE_WORKFLOW_MESSAGE,
+    RA_GENERAL_EXCEPTION_ARG,
+    RA_GENERAL_EXCEPTION,
+    RA_GENERAL_WARNING,
+    RA_MISSING_PARAM,
+    RA_AUDIT_EXEC,
+    RA_GENERAL_METRICS,
+    RA_CREATE_STACK_TIMEOUT,
+    RA_DELETE_STACK_TIMEOUT,
+    RA_UPDATE_STACK_TIMEOUT,
+    RA_CONNECTION_EXCEPTION,
+    RA_PARSING_ERROR,
+    RA_PROPERTIES_NOT_FOUND,
+    RA_LOAD_PROPERTIES_SUC,
+    RA_NETWORK_ALREADY_EXIST,
+    RA_UPDATE_NETWORK_ERR,
+    RA_CREATE_STACK_ERR,
+    RA_UPDATE_STACK_ERR,
+    RA_CREATE_TENANT_ERR,
+    RA_NETWORK_NOT_FOUND,
+    RA_NETWORK_ORCHE_MODE_NOT_SUPPORT,
+    RA_CREATE_NETWORK_EXC,
+    RA_NS_EXC,
+    RA_PARAM_NOT_FOUND,
+    RA_CONFIG_EXC,
+    RA_UNKOWN_PARAM,
+    RA_VLAN_PARSE,
+    RA_DELETE_NETWORK_EXC,
+    RA_ROLLBACK_NULL,
+    RA_TENANT_NOT_FOUND,
+    RA_QUERY_NETWORK_EXC,
+    RA_CREATE_NETWORK_NOTIF_EXC,
+    RA_ASYNC_ROLLBACK,
+    RA_WSDL_NOT_FOUND,
+    RA_WSDL_URL_CONVENTION_EXC,
+    RA_INIT_NOTIF_EXC,
+    RA_SET_CALLBACK_AUTH_EXC,
+    RA_FAULT_INFO_EXC,
+    RA_MARSHING_ERROR,
+    RA_PARSING_REQUEST_ERROR,
+    RA_SEND_REQUEST_SDNC,
+    RA_RESPONSE_FROM_SDNC,
+    RA_EXCEPTION_COMMUNICATE_SDNC,
+    RA_EVALUATE_XPATH_ERROR,
+    RA_ANALYZE_ERROR_EXC,
+    RA_ERROR_GET_RESPONSE_SDNC,
+    RA_CALLBACK_BPEL,
+    RA_INIT_CALLBACK_WSDL_ERR,
+    RA_CALLBACK_BPEL_EXC,
+    RA_CALLBACK_BPEL_COMPLETE,
+    RA_SDNC_MISS_CONFIG_PARAM,
+    RA_SDNC_INVALID_CONFIG,
+    RA_PRINT_URL,
+    RA_ERROR_CREATE_SDNC_REQUEST,
+    RA_ERROR_CREATE_SDNC_RESPONSE,
+    RA_ERROR_CONVERT_XML2STR,
+    RA_RECEIVE_SDNC_NOTIF,
+    RA_INIT_SDNC_ADAPTER,
+    RA_SEND_REQUEST_APPC_ERR,
+    RA_SEND_REQUEST_SDNC_ERR,
+    RA_RECEIVE_BPEL_REQUEST,
+    RA_TENANT_ALREADY_EXIST,
+    RA_UPDATE_TENANT_ERR,
+    RA_DELETE_TEMAMT_ERR,
+    RA_ROLLBACK_TENANT_ERR,
+    RA_QUERY_VNF_ERR,
+    RA_VNF_ALREADY_EXIST,
+    RA_VNF_UNKNOWN_PARAM,
+    RA_VNF_EXTRA_PARAM,
+    RA_CREATE_VNF_ERR,
+    RA_VNF_NOT_EXIST,
+    RA_UPDATE_VNF_ERR,
+    RA_DELETE_VNF_ERR,
+    RA_ASYNC_CREATE_VNF,
+    RA_SEND_VNF_NOTIF_ERR,
+    RA_ASYNC_CREATE_VNF_COMPLETE,
+    RA_ASYNC_UPDATE_VNF,
+    RA_ASYNC_UPDATE_VNF_COMPLETE,
+    RA_ASYNC_QUERY_VNF,
+    RA_ASYNC_QUERY_VNF_COMPLETE,
+    RA_ASYNC_DELETE_VNF,
+    RA_ASYNC_DELETE_VNF_COMPLETE,
+    RA_ASYNC_ROLLBACK_VNF,
+    RA_ASYNC_ROLLBACK_VNF_COMPLETE,
+    RA_ROLLBACK_VNF_ERR,
+    RA_DB_INVALID_STATUS,
+    RA_CANT_UPDATE_REQUEST,
+    RA_DB_REQUEST_NOT_EXIST,
+    RA_CONFIG_NOT_FOUND,
+    RA_CONFIG_LOAD,
+    RA_RECEIVE_WORKFLOW_MESSAGE,
     // BPEL engine Messages
-    BPMN_GENERAL_INFO, BPMN_GENERAL_EXCEPTION_ARG, BPMN_GENERAL_EXCEPTION, BPMN_GENERAL_WARNING, BPMN_AUDIT_EXEC, BPMN_GENERAL_METRICS, BPMN_URN_MAPPING_FAIL, BPMN_VARIABLE_NULL, BPMN_CALLBACK_EXCEPTION,
+    BPMN_GENERAL_INFO,
+    BPMN_GENERAL_EXCEPTION_ARG,
+    BPMN_GENERAL_EXCEPTION,
+    BPMN_GENERAL_WARNING,
+    BPMN_AUDIT_EXEC,
+    BPMN_GENERAL_METRICS,
+    BPMN_URN_MAPPING_FAIL,
+    BPMN_VARIABLE_NULL,
+    BPMN_CALLBACK_EXCEPTION,
     // ASDC Messages
-    ASDC_GENERAL_EXCEPTION_ARG, ASDC_GENERAL_EXCEPTION, ASDC_GENERAL_WARNING, ASDC_GENERAL_INFO, ASDC_AUDIT_EXEC, ASDC_GENERAL_METRICS, ASDC_CREATE_SERVICE, ASDC_ARTIFACT_ALREADY_DEPLOYED, ASDC_CREATE_ARTIFACT, ASDC_ARTIFACT_INSTALL_EXC, ASDC_ARTIFACT_ALREADY_DEPLOYED_DETAIL, ASDC_ARTIFACT_NOT_DEPLOYED_DETAIL, ASDC_ARTIFACT_CHECK_EXC, ASDC_INIT_ASDC_CLIENT_EXC, ASDC_INIT_ASDC_CLIENT_SUC, ASDC_LOAD_ASDC_CLIENT_EXC, ASDC_SINGLETON_CHECKT_EXC, ASDC_SHUTDOWN_ASDC_CLIENT_EXC, ASDC_CHECK_HEAT_TEMPLATE, ASDC_START_INSTALL_ARTIFACT, ASDC_ARTIFACT_TYPE_NOT_SUPPORT, ASDC_ARTIFACT_ALREADY_EXIST, ASDC_ARTIFACT_DOWNLOAD_SUC, ASDC_ARTIFACT_DOWNLOAD_FAIL, ASDC_START_DEPLOY_ARTIFACT, ASDC_SEND_NOTIF_ASDC, ASDC_SEND_NOTIF_ASDC_EXEC, ASDC_RECEIVE_CALLBACK_NOTIF, ASDC_RECEIVE_SERVICE_NOTIF, ASDC_ARTIFACT_NULL, ASDC_SERVICE_NOT_SUPPORT, ASDC_ARTIFACT_DEPLOY_SUC, ASDC_PROPERTIES_NOT_FOUND, ASDC_PROPERTIES_LOAD_SUCCESS,
+    ASDC_GENERAL_EXCEPTION_ARG,
+    ASDC_GENERAL_EXCEPTION,
+    ASDC_GENERAL_WARNING,
+    ASDC_GENERAL_INFO,
+    ASDC_AUDIT_EXEC,
+    ASDC_GENERAL_METRICS,
+    ASDC_CREATE_SERVICE,
+    ASDC_ARTIFACT_ALREADY_DEPLOYED,
+    ASDC_CREATE_ARTIFACT,
+    ASDC_ARTIFACT_INSTALL_EXC,
+    ASDC_ARTIFACT_ALREADY_DEPLOYED_DETAIL,
+    ASDC_ARTIFACT_NOT_DEPLOYED_DETAIL,
+    ASDC_ARTIFACT_CHECK_EXC,
+    ASDC_INIT_ASDC_CLIENT_EXC,
+    ASDC_INIT_ASDC_CLIENT_SUC,
+    ASDC_LOAD_ASDC_CLIENT_EXC,
+    ASDC_SINGLETON_CHECKT_EXC,
+    ASDC_SHUTDOWN_ASDC_CLIENT_EXC,
+    ASDC_CHECK_HEAT_TEMPLATE,
+    ASDC_START_INSTALL_ARTIFACT,
+    ASDC_ARTIFACT_TYPE_NOT_SUPPORT,
+    ASDC_ARTIFACT_ALREADY_EXIST,
+    ASDC_ARTIFACT_DOWNLOAD_SUC,
+    ASDC_ARTIFACT_DOWNLOAD_FAIL,
+    ASDC_START_DEPLOY_ARTIFACT,
+    ASDC_SEND_NOTIF_ASDC,
+    ASDC_SEND_NOTIF_ASDC_EXEC,
+    ASDC_RECEIVE_CALLBACK_NOTIF,
+    ASDC_RECEIVE_SERVICE_NOTIF,
+    ASDC_ARTIFACT_NULL,
+    ASDC_SERVICE_NOT_SUPPORT,
+    ASDC_ARTIFACT_DEPLOY_SUC,
+    ASDC_PROPERTIES_NOT_FOUND,
+    ASDC_PROPERTIES_LOAD_SUCCESS,
     // Default Messages, in case Log catalog is not defined
-    GENERAL_EXCEPTION_ARG, GENERAL_EXCEPTION, GENERAL_WARNING, AUDIT_EXEC, GENERAL_METRICS, LOGGER_SETUP, LOGGER_NOT_FOUND, LOGGER_UPDATE_SUC, LOGGER_UPDATE_DEBUG, LOGGER_UPDATE_DEBUG_SUC, LOAD_PROPERTIES_SUC, NO_PROPERTIES, MADATORY_PARAM_MISSING, LOAD_PROPERTIES_FAIL, INIT_LOGGER, INIT_LOGGER_FAIL, JAXB_EXCEPTION, IDENTITY_SERVICE_NOT_FOUND;
+    GENERAL_EXCEPTION_ARG,
+    GENERAL_EXCEPTION,
+    GENERAL_WARNING,
+    AUDIT_EXEC,
+    GENERAL_METRICS,
+    LOGGER_SETUP,
+    LOGGER_NOT_FOUND,
+    LOGGER_UPDATE_SUC,
+    LOGGER_UPDATE_DEBUG,
+    LOGGER_UPDATE_DEBUG_SUC,
+    LOAD_PROPERTIES_SUC,
+    NO_PROPERTIES,
+    MADATORY_PARAM_MISSING,
+    LOAD_PROPERTIES_FAIL,
+    INIT_LOGGER,
+    INIT_LOGGER_FAIL,
+    JAXB_EXCEPTION,
+    IDENTITY_SERVICE_NOT_FOUND;
 }
diff --git a/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java b/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java
index 9a184b0a51..11cd3d42b7 100644
--- a/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java
+++ b/common/src/main/java/org/onap/so/serviceinstancebeans/ModelType.java
@@ -24,5 +24,14 @@ package org.onap.so.serviceinstancebeans;
  * Enum for Model Type values returned by API Handler to BPMN
  */
 public enum ModelType {
-    service, vnf, vfModule, volumeGroup, network, configuration, connectionPoint, pnf, networkInstanceGroup, instanceGroup
+    service,
+    vnf,
+    vfModule,
+    volumeGroup,
+    network,
+    configuration,
+    connectionPoint,
+    pnf,
+    networkInstanceGroup,
+    instanceGroup
 }
diff --git a/common/src/main/java/org/onap/so/utils/TargetEntity.java b/common/src/main/java/org/onap/so/utils/TargetEntity.java
index 5f87378b79..0c59887de7 100644
--- a/common/src/main/java/org/onap/so/utils/TargetEntity.java
+++ b/common/src/main/java/org/onap/so/utils/TargetEntity.java
@@ -23,7 +23,20 @@ package org.onap.so.utils;
 import java.util.EnumSet;
 
 public enum TargetEntity {
-    OPENSTACK_ADAPTER, BPMN, GRM, AAI, DMAAP, POLICY, CATALOG_DB, REQUEST_DB, VNF_ADAPTER, SDNC_ADAPTER, SNIRO, SDC, EXTERNAL, MULTICLOUD;
+    OPENSTACK_ADAPTER,
+    BPMN,
+    GRM,
+    AAI,
+    DMAAP,
+    POLICY,
+    CATALOG_DB,
+    REQUEST_DB,
+    VNF_ADAPTER,
+    SDNC_ADAPTER,
+    SNIRO,
+    SDC,
+    EXTERNAL,
+    MULTICLOUD;
 
     private static final String PREFIX = "SO";
 
diff --git a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/Action.java b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/Action.java
index 77dbff9ebb..6957e1fe73 100644
--- a/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/Action.java
+++ b/mso-api-handlers/mso-api-handler-common/src/main/java/org/onap/so/apihandlerinfra/Action.java
@@ -24,5 +24,27 @@ package org.onap.so.apihandlerinfra;
  * Enum for Status values returned by API Handler to Tail-F
  */
 public enum Action implements Actions {
-    createInstance, updateInstance, deleteInstance, configureInstance, replaceInstance, activateInstance, deactivateInstance, enablePort, disablePort, addRelationships, removeRelationships, inPlaceSoftwareUpdate, applyUpdatedConfig, completeTask, assignInstance, unassignInstance, compareModel, scaleInstance, deactivateAndCloudDelete, scaleOut, recreateInstance, addMembers, removeMembers
+    createInstance,
+    updateInstance,
+    deleteInstance,
+    configureInstance,
+    replaceInstance,
+    activateInstance,
+    deactivateInstance,
+    enablePort,
+    disablePort,
+    addRelationships,
+    removeRelationships,
+    inPlaceSoftwareUpdate,
+    applyUpdatedConfig,
+    completeTask,
+    assignInstance,
+    unassignInstance,
+    compareModel,
+    scaleInstance,
+    deactivateAndCloudDelete,
+    scaleOut,
+    recreateInstance,
+    addMembers,
+    removeMembers
 }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Action.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Action.java
index 974d025ff2..d0302f2e59 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Action.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/Action.java
@@ -22,5 +22,28 @@ package org.onap.so.apihandlerinfra;
 
 
 public enum Action implements Actions {
-    createInstance, updateInstance, deleteInstance, configureInstance, replaceInstance, replaceInstanceRetainAssignments, activateInstance, deactivateInstance, enablePort, disablePort, addRelationships, removeRelationships, inPlaceSoftwareUpdate, applyUpdatedConfig, completeTask, assignInstance, unassignInstance, compareModel, scaleInstance, deactivateAndCloudDelete, scaleOut, recreateInstance, addMembers, removeMembers
+    createInstance,
+    updateInstance,
+    deleteInstance,
+    configureInstance,
+    replaceInstance,
+    replaceInstanceRetainAssignments,
+    activateInstance,
+    deactivateInstance,
+    enablePort,
+    disablePort,
+    addRelationships,
+    removeRelationships,
+    inPlaceSoftwareUpdate,
+    applyUpdatedConfig,
+    completeTask,
+    assignInstance,
+    unassignInstance,
+    compareModel,
+    scaleInstance,
+    deactivateAndCloudDelete,
+    scaleOut,
+    recreateInstance,
+    addMembers,
+    removeMembers
 }
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoSubsystems.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoSubsystems.java
index fd0df1d2b0..13f1e52068 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoSubsystems.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/MsoSubsystems.java
@@ -20,9 +20,14 @@
 package org.onap.so.apihandlerinfra;
 
 public enum MsoSubsystems {
-    APIH("API Handler"), ASDC("ASDC Controller"), BPMN("BPMN Infra"), CATALOGDB("CatalogDb Adapter"), OPENSTACK(
-            "Openstack Adapter"), REQUESTDB(
-                    "RequestDB Adapter"), REQUESTDBATT("RequestDB Adapter ATT Svc"), SDNC("SDNC Adapter");
+    APIH("API Handler"),
+    ASDC("ASDC Controller"),
+    BPMN("BPMN Infra"),
+    CATALOGDB("CatalogDb Adapter"),
+    OPENSTACK("Openstack Adapter"),
+    REQUESTDB("RequestDB Adapter"),
+    REQUESTDBATT("RequestDB Adapter ATT Svc"),
+    SDNC("SDNC Adapter");
     private String subsystem;
 
     private MsoSubsystems(String subsystem) {
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationAction.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationAction.java
index cf8644eedc..b340fdea2b 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationAction.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationAction.java
@@ -22,9 +22,17 @@ package org.onap.so.db.catalog.beans;
 
 // TODO find this file a new location?
 public enum OrchestrationAction {
-    ASSIGN("Assign"), UNASSIGN("Unassign"), ACTIVATE("Activate"), DEACTIVATE("Deactivate"), CHANGE_MODEL(
-            "ChangeModel"), CREATE("Create"), DELETE("Delete"), UPDATE(
-                    "Update"), ADD_MEMBERS("AddMembers"), REMOVE_MEMBERS("RemoveMembers"), CUSTOM("Custom");
+    ASSIGN("Assign"),
+    UNASSIGN("Unassign"),
+    ACTIVATE("Activate"),
+    DEACTIVATE("Deactivate"),
+    CHANGE_MODEL("ChangeModel"),
+    CREATE("Create"),
+    DELETE("Delete"),
+    UPDATE("Update"),
+    ADD_MEMBERS("AddMembers"),
+    REMOVE_MEMBERS("RemoveMembers"),
+    CUSTOM("Custom");
 
     private final String name;
 
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationStatus.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationStatus.java
index e608bfed21..56effb572f 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationStatus.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/OrchestrationStatus.java
@@ -21,12 +21,18 @@
 package org.onap.so.db.catalog.beans;
 
 public enum OrchestrationStatus {
-    ACTIVE("Active", "active"), ASSIGNED("Assigned", "assigned"), CREATED("Created", "created"), INVENTORIED(
-            "Inventoried", "inventoried"), PENDING("Pending", "pending"), PENDING_ACTIVATION("PendingActivation",
-                    "pending.?activation"), PENDING_CREATE("PendingCreate", "pending.?create"), PENDING_DELETE(
-                            "PendingDelete", "pending.?delete"), PRECREATED("PreCreated",
-                                    "pre.?created"), CONFIGASSIGNED("ConfigAssigned", "config.?assigned"), CONFIGURE(
-                                            "Configure", "configure"), CONFIGURED("Configured", "configured");
+    ACTIVE("Active", "active"),
+    ASSIGNED("Assigned", "assigned"),
+    CREATED("Created", "created"),
+    INVENTORIED("Inventoried", "inventoried"),
+    PENDING("Pending", "pending"),
+    PENDING_ACTIVATION("PendingActivation", "pending.?activation"),
+    PENDING_CREATE("PendingCreate", "pending.?create"),
+    PENDING_DELETE("PendingDelete", "pending.?delete"),
+    PRECREATED("PreCreated", "pre.?created"),
+    CONFIGASSIGNED("ConfigAssigned", "config.?assigned"),
+    CONFIGURE("Configure", "configure"),
+    CONFIGURED("Configured", "configured");
 
     private final String name;
     private final String fuzzyMatcher;
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ResourceType.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ResourceType.java
index b41548ca99..4fd28c910e 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ResourceType.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/beans/ResourceType.java
@@ -21,9 +21,15 @@
 package org.onap.so.db.catalog.beans;
 
 public enum ResourceType {
-    SERVICE("Service"), VNF("Vnf"), VOLUME_GROUP("VolumeGroup"), VF_MODULE("VfModule"), NETWORK(
-            "Network"), NETWORK_COLLECTION("NetworkCollection"), CONFIGURATION(
-                    "Configuration"), INSTANCE_GROUP("InstanceGroup"), NO_VALIDATE("NoValidate");
+    SERVICE("Service"),
+    VNF("Vnf"),
+    VOLUME_GROUP("VolumeGroup"),
+    VF_MODULE("VfModule"),
+    NETWORK("Network"),
+    NETWORK_COLLECTION("NetworkCollection"),
+    CONFIGURATION("Configuration"),
+    INSTANCE_GROUP("InstanceGroup"),
+    NO_VALIDATE("NoValidate");
 
     private final String name;
 
diff --git a/project-configs/code-tools/onap-eclipse-format.xml b/project-configs/code-tools/onap-eclipse-format.xml
index cd136171fa..093866afc5 100644
--- a/project-configs/code-tools/onap-eclipse-format.xml
+++ b/project-configs/code-tools/onap-eclipse-format.xml
@@ -30,7 +30,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_semicolon_in_for" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.disabling_tag" value="@formatter:off"/>
 <setting id="org.eclipse.jdt.core.formatter.continuation_indentation" value="2"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="0"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_enum_constants" value="48"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_imports" value="0"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_after_package" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_binary_operator" value="insert"/>
@@ -194,7 +194,7 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_question_in_wildcard" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.blank_lines_before_method" value="1"/>
 <setting id="org.eclipse.jdt.core.formatter.alignment_for_superclass_in_type_declaration" value="16"/>
-<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="16"/>
+<setting id="org.eclipse.jdt.core.formatter.alignment_for_superinterfaces_in_enum_declaration" value="48"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_parenthesized_expression_in_throw" value="insert"/>
 <setting id="org.eclipse.jdt.core.formatter.wrap_before_assignment_operator" value="false"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_colon_in_labeled_statement" value="do not insert"/>
@@ -310,4 +310,4 @@
 <setting id="org.eclipse.jdt.core.formatter.insert_space_after_opening_paren_in_annotation" value="do not insert"/>
 <setting id="org.eclipse.jdt.core.formatter.insert_space_before_opening_paren_in_switch" value="insert"/>
 </profile>
-</profiles>
+</profiles>
\ No newline at end of file