Merge "Corrected enum formatting by plugin"

7 files changed, 82 insertions, 65 deletions

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;