1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

1 files changed, 8 insertions, 6 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandler.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandler.java
index 8d44d213b1..1922cb421a 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandler.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/NetworkRequestHandler.java
@@ -94,6 +94,8 @@ public class NetworkRequestHandler {
             .entity (NOT_FOUND)
             .build ();
 
+    private RequestsDatabase requestDB = RequestsDatabase.getInstance();
+    
     @GET
     public Response queryFilters (@QueryParam("network-type") String networkType,
                                   @QueryParam("service-type") String serviceType,
@@ -244,7 +246,7 @@ public class NetworkRequestHandler {
 
         String responseString = null;
 
-        InfraActiveRequests activeReq = RequestsDatabase.getRequestFromInfraActive (requestId, "NETWORK");
+        InfraActiveRequests activeReq = requestDB.getRequestFromInfraActive (requestId, "NETWORK");
         if (activeReq != null) {
             // build response for active
             responseString = infraRequestsResponse (activeReq, version);
@@ -261,7 +263,7 @@ public class NetworkRequestHandler {
 
         getMsoLogger ().debug ("getRequest based on " + queryAttribute + ": " + queryValue);
 
-        List <InfraActiveRequests> activeReqList = RequestsDatabase.getRequestListFromInfraActive (queryAttribute,
+        List <InfraActiveRequests> activeReqList = requestDB.getRequestListFromInfraActive (queryAttribute,
                                                                                                    queryValue,
                                                                                                    "NETWORK");
 
@@ -433,7 +435,7 @@ public class NetworkRequestHandler {
             InfraActiveRequests dup = null;
             try {
 
-                dup = RequestsDatabase.checkDuplicateByVnfName (msoRequest.getNetworkInputs ().getNetworkName (),
+                dup = requestDB.checkDuplicateByVnfName (msoRequest.getNetworkInputs ().getNetworkName (),
                                                                 msoRequest.getRequestInfo ().getAction ().value (),
                                                                 "NETWORK");
 
@@ -471,7 +473,7 @@ public class NetworkRequestHandler {
             InfraActiveRequests dup = null;
             msoLogger.debug ("Checking for a duplicate with the same network-id");
             try {
-                dup = RequestsDatabase.checkDuplicateByVnfId (msoRequest.getNetworkInputs ().getNetworkId (),
+                dup = requestDB.checkDuplicateByVnfId (msoRequest.getNetworkInputs ().getNetworkId (),
                                                               msoRequest.getRequestInfo ().getAction ().value (),
                                                               "NETWORK");
 
@@ -511,7 +513,7 @@ public class NetworkRequestHandler {
         String orchestrationURI = "";
 
         // Query MSO Catalog DB
-        try (CatalogDatabase db = new CatalogDatabase()) {
+        try (CatalogDatabase db = CatalogDatabase.getInstance()) {
 
             Recipe recipe = null;
 
@@ -618,7 +620,7 @@ public class NetworkRequestHandler {
                 String bpelXMLResponseBody = respHandler.getResponseBody ();
                 msoLogger.debug ("Received from BPEL: " + bpelXMLResponseBody);
                 msoRequest.setStatus (org.openecomp.mso.apihandlerinfra.networkbeans.RequestStatusType.IN_PROGRESS);
-                RequestsDatabase.updateInfraStatus (msoRequest.getRequestId (),
+                requestDB.updateInfraStatus (msoRequest.getRequestId (),
                         Status.IN_PROGRESS.toString (),
                         Constants.PROGRESS_REQUEST_IN_PROGRESS,
                         Constants.MODIFIED_BY_APIHANDLER);