From: Marcus G K Williams <marcus.williams@intel.com>
Date: Thu, 7 Sep 2017 20:26:31 +0000 (-0700)
Subject: Fix dblib DBResourceManager instantiation
X-Git-Tag: v1.2.0~92
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=082f306bcb026bf49b1067f55d59522c01e991cd;p=appc.git

Fix dblib DBResourceManager instantiation

Fix APPC Build, failing upstream and locally due to
change in CCSDK that changes dblib to use service
injection via Aries Blueprint. The change causing
this in CCSDK is https://gerrit.onap.org/r/#/c/7931/

Issue-Id: APPC-196
Change-Id: I9bcfb6d87b7527fd07cb76a242b272a5bc0ad07c
Signed-off-by: Marcus G K Williams <marcus.williams@intel.com>
---

diff --git a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/tool/DbServiceUtil.java b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/tool/DbServiceUtil.java
index 5881e7f0b..c8340816e 100644
--- a/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/tool/DbServiceUtil.java
+++ b/appc-config/appc-config-generator/provider/src/main/java/org/openecomp/sdnc/config/generator/tool/DbServiceUtil.java
@@ -65,7 +65,7 @@ public class DbServiceUtil
         File file = new File("/opt/app/bvc/properties/dblib.properties");        
         URL propURL = file.toURI().toURL();    
         props.load(propURL.openStream());        
-        jdbcDataSource = DBResourceManager.create(props);
+        jdbcDataSource = new DBResourceManager(props);
         return jdbcDataSource;
         
     }
diff --git a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java
index 0174d477a..1999793ee 100644
--- a/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java
+++ b/appc-config/appc-encryption-tool/provider/src/main/java/org/openecomp/appc/encryptiontool/wrapper/DbServiceUtil.java
@@ -65,7 +65,7 @@ public class DbServiceUtil
         File file = new File("/opt/app/bvc/properties/dblib.properties");
         URL propURL = file.toURI().toURL();
         props.load(propURL.openStream());
-        jdbcDataSource = DBResourceManager.create(props);
+        jdbcDataSource = new DBResourceManager(props);
         return jdbcDataSource;
     }
 
diff --git a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbService.java b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbService.java
index 46bb240f5..02207709d 100644
--- a/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbService.java
+++ b/appc-inbound/appc-design-services/provider/src/main/java/org/openecomp/appc/design/dbervices/DbService.java
@@ -93,7 +93,7 @@ public class DbService {
         }
         if (dblibSvc == null) {
             try {
-                dblibSvc = DBResourceManager.create(System.getProperties());
+                dblibSvc = new DBResourceManager(System.getProperties());
             } catch (Exception e) {
                 Log.error("Caught exception trying to create db service", e);
             }