Merge "Corrected enum formatting by plugin"

4 files changed, 36 insertions, 32 deletions

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;