support no payload for alacarte deletes

Swap to using HTTP Enumerations rather than ints
Add Unit Tests to Service Instances endpoint
Add Vnf Tests remove Abstract class
Clean up usage of abstract classes
Fix volume and module bean wiring issues
Add logic to find create request if cloud not in AAI
Updated network to take in version pathparam
Additonal refactor of the endpoints
Add missing license headers to all files
Clean up public variable usage, move to protected

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

1 files changed, 8 insertions, 8 deletions

diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java
index 2bfa2856d2..30801119b6 100644
--- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java
+++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java
@@ -655,6 +655,8 @@ public class CatalogDbClient {
                         .queryParam(SERVICE_MODEL_UUID, modelUUID).queryParam(ACTION, action).build().toString()));
     }
 
+
+
     public NetworkRecipe getFirstNetworkRecipeByModelNameAndAction(String modelName, String action) {
         return this.getSingleResource(networkRecipeClient, UriBuilder.fromUri(findFirstByModelNameAndAction)
                 .queryParam(MODEL_NAME, modelName).queryParam(ACTION, action).build());
@@ -717,22 +719,20 @@ public class CatalogDbClient {
     }
 
     public VnfComponentsRecipe getFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction(
-            String vfModuleModelUUID, String vnfComponentType, String action) {
+            String vfModuleModelUUID, String modelType, String action) {
         return this.getSingleResource(vnfComponentsRecipeClient,
                 getUri(UriBuilder.fromUri(findFirstVnfComponentsRecipeByVfModuleModelUUIDAndVnfComponentTypeAndAction)
-                        .queryParam(VF_MODULE_MODEL_UUID, vfModuleModelUUID)
-                        .queryParam(VNF_COMPONENT_TYPE, vnfComponentType).queryParam(ACTION, action).build()
-                        .toString()));
+                        .queryParam(VF_MODULE_MODEL_UUID, vfModuleModelUUID).queryParam(VNF_COMPONENT_TYPE, modelType)
+                        .queryParam(ACTION, action).build().toString()));
     }
 
-    public VnfComponentsRecipe getFirstVnfComponentsRecipeByVnfComponentTypeAndAction(String vnfComponentType,
-            String action) {
+    public VnfComponentsRecipe getFirstVnfComponentsRecipeByVnfComponentTypeAndAction(String modelType, String action) {
         return this.getSingleResource(vnfComponentsRecipeClient,
                 getUri(UriBuilder.fromUri(findFirstVnfComponentsRecipeByVnfComponentTypeAndAction)
-                        .queryParam(VNF_COMPONENT_TYPE, vnfComponentType).queryParam(ACTION, action).build()
-                        .toString()));
+                        .queryParam(VNF_COMPONENT_TYPE, modelType).queryParam(ACTION, action).build().toString()));
     }
 
+
     protected URI getUri(String template) {
         return URI.create(template);
     }