1 files changed, 27 insertions, 49 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/RemDbInfo.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/RemDbInfo.java
index 57c1e31d..56e117f3 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/RemDbInfo.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/RemDbInfo.java
@@ -39,53 +39,35 @@ package org.onap.portalsdk.analytics.util;
 
 import java.sql.Connection;
 import java.util.HashMap;
-
-import javax.servlet.ServletContext;
-
 import org.onap.portalsdk.analytics.system.DbUtils;
 import org.onap.portalsdk.analytics.system.Globals;
-import org.onap.portalsdk.analytics.system.fusion.adapter.RaptorAdapter;
-import org.onap.portalsdk.analytics.system.fusion.adapter.SpringContext;
-
+import org.springframework.stereotype.Component;
 import com.mchange.v2.c3p0.ComboPooledDataSource;
 
+@Component
 public class RemDbInfo {
-	private HashMap remDbMap 		= null;
-	private HashMap remDbTypeMap 	= null;
-	private HashMap remDbConnectionMap = null;
-
-	public RemDbInfo() throws Exception {
-		if (remDbMap == null) {
-			load();
-		}
-	}
+	private static HashMap remDbMap 		= null;
+	private static HashMap remDbTypeMap 	= null;
+	private static HashMap remDbConnectionMap = null;
 	
-	private RaptorAdapter raptorAdapter;
+	public static void load() {
+		if(remDbMap!=null)
+			return;
 
-	
-	public void initializeDbUtils(ServletContext servletContext) {
-		raptorAdapter = (RaptorAdapter)SpringContext.getApplicationContext().getBean("raptorAdapter");
-	} // initializeDbUtils
-
-	public void load() throws Exception {
         remDbMap 		= new HashMap();
         remDbTypeMap 	= new HashMap();
         remDbConnectionMap = new HashMap();
         try {
-		//String query = " SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE, rownum id  FROM SCHEMA_INFO a " +
-		//		       " where schema_id = 'local' union " +
-        //               " SELECT a.SCHEMA_ID, a.SCHEMA_DESC, DATASOURCE_TYPE, (rownum+1) id  FROM SCHEMA_INFO a " +
-        //               " where schema_id <> 'local' order by id ";
         String query = Globals.getRemoteDbSchemaSql();
 		DataSet ds = null;
 		Globals.getDbUtils();
 		ds = DbUtils.executeQuery(query);
 
-		String prefix = "", desc = "", dbType = "", connectionUrl = "", username = "", password = "", driver_class = "";
+			String dbId = "", desc = "", dbType = "", connectionUrl = "", username = "", password = "", driver_class = "";
 		
 		if(ds.getRowCount() > 0) {
 			for (int i = 0; i < ds.getRowCount(); i++) {
-					prefix = ds.getItem(i, 0);
+					dbId = ds.getItem(i, 0);
 					desc = ds.getItem(i, 1);
 					dbType = ds.getItem(i, 2);
 					connectionUrl = ds.getItem(i, 3);
@@ -98,44 +80,40 @@ public class RemDbInfo {
 					cpds.setJdbcUrl( connectionUrl); 
 					cpds.setUser(username); 
 					cpds.setPassword(password); 
-					
-					
-					
-				
-				remDbMap.put(prefix, desc);
-				remDbTypeMap.put(prefix, dbType);
-				remDbConnectionMap.put(prefix, cpds);
-			}
-		} else {
-			remDbMap.put("local", "local");
-			remDbTypeMap.put("local", Globals.getDBType());
-			remDbConnectionMap.put("local", raptorAdapter.getConnection());
+					cpds.setMinPoolSize(Integer.parseInt(ds.getItem(i, 7)));
+					cpds.setMaxPoolSize(Integer.parseInt(ds.getItem(i, 8)));
+					cpds.setIdleConnectionTestPeriod(Integer.parseInt(ds.getItem(i, 9)));
+						
+					remDbMap.put(dbId, desc);
+					remDbTypeMap.put(dbId, dbType);
+					remDbConnectionMap.put(dbId, cpds);
+				}
 		}
         }
         catch (Exception e) {}
         
 	}
 
-	public String getDesc(String prefix) {
-		if ((remDbMap != null) && (remDbMap.containsKey(prefix))) {
-			return (String) remDbMap.get(prefix);
+	public String getDesc(String dbId) {
+		if ((remDbMap != null) && (remDbMap.containsKey(dbId))) {
+			return (String) remDbMap.get(dbId);
 		}
 
 		return "";
 	}
 	
-	public String getDBType(String prefix) {
-		if ((remDbTypeMap != null) && (remDbTypeMap.containsKey(prefix))) {
-			return (String) remDbTypeMap.get(prefix);
+	public String getDBType(String dbId) {
+		if ((remDbTypeMap != null) && (remDbTypeMap.containsKey(dbId))) {
+			return (String) remDbTypeMap.get(dbId);
 		}
 
 		return "";
 	}	
 	
-	public Connection getDBConnection(String prefix) {
-		if ((remDbConnectionMap != null) && (remDbConnectionMap.containsKey(prefix))) {
+	public Connection getDBConnection(String dbId) {
+		if ((remDbConnectionMap != null) && (remDbConnectionMap.containsKey(dbId))) {
 			try {
-			 return ((ComboPooledDataSource) remDbConnectionMap.get(prefix)).getConnection();
+			 return ((ComboPooledDataSource) remDbConnectionMap.get(dbId)).getConnection();
 			} catch (Exception ex) {
 				ex.printStackTrace();
 				return null;