Added logic to update the requests DB when a

Added logic to update the requests DB when a Create or Delete BB is
silent success and updated enum
Updated regrex and add junit test for orch validator and formatted files
Formatted pom files that were not formatted correctly.
Removed use of ternary operator if statement and moved enum to static
final.
Updated equals method to include resource status message for mockito
verify
Removed resourceStatusMessage from equals and used argument capture
instead

Issue-ID: SO-2782
Signed-off-by: Benjamin, Max (mb388a) <mb388a@att.com>
Change-Id: I3a292f57d2771200ce85a99e845e776e2f3bd600

1 files changed, 16 insertions, 10 deletions

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 4fd28c910e..74f58a210c 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,24 +21,30 @@
 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", "SERVICE_INSTANCE_ID"),
+    VNF("Vnf", "GENERIC_VNF_ID"),
+    VOLUME_GROUP("VolumeGroup", "VOLUME_GROUP_ID"),
+    VF_MODULE("VfModule", "VF_MODULE_ID"),
+    NETWORK("Network", "NETWORK_ID"),
+    NETWORK_COLLECTION("NetworkCollection", "NETWORK_COLLECTION_ID"),
+    CONFIGURATION("Configuration", "CONFIGURATION_ID"),
+    INSTANCE_GROUP("InstanceGroup", "INSTANCE_GROUP_ID"),
+    NO_VALIDATE("NoValidate", "");
 
     private final String name;
+    private final String resourceKey;
 
-    private ResourceType(String name) {
+    private ResourceType(String name, String resourceKey) {
         this.name = name;
+        this.resourceKey = resourceKey;
     }
 
     @Override
     public String toString() {
         return name;
     }
+
+    public String getResourceKey() {
+        return resourceKey;
+    }
 }