Refactor dblib

Changed openecomp references in dblib, filters and sli to onap.  Note: these
must be committed together to get a clean compile.

Issue: CCSDK-11
Change-Id: Ibe0f64fb20f3ae9cdda2f7ea969ca722bbde0d15
Signed-off-by: Dan Timoney <dtimoney@att.com>

4 files changed, 279 insertions, 0 deletions

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/AbstractDBResourceManagerFactory.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/AbstractDBResourceManagerFactory.java
new file mode 100644
index 00000000..e88734d2
--- /dev/null
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/AbstractDBResourceManagerFactory.java
@@ -0,0 +1,39 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * onap
+ * ================================================================================
+ * Copyright (C) 2016 - 2017 ONAP
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.sli.core.dblib.factory;
+
+import org.onap.ccsdk.sli.core.dblib.jdbc.JdbcDbResourceManagerFactory;
+
+/**
+ * @version $Revision: 1.1 $
+ * Change Log
+ * Author         Date     Comments
+ * ============== ======== ====================================================
+ * Rich Tabedzki
+ */
+public class AbstractDBResourceManagerFactory {
+
+	public static AbstractResourceManagerFactory getFactory(String type) throws FactoryNotDefinedException {
+
+		// JDBC
+		return JdbcDbResourceManagerFactory.createIntstance();
+	}
+}
diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/AbstractResourceManagerFactory.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/AbstractResourceManagerFactory.java
new file mode 100644
index 00000000..6fc7e7a0
--- /dev/null
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/AbstractResourceManagerFactory.java
@@ -0,0 +1,104 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * onap
+ * ================================================================================
+ * Copyright (C) 2016 - 2017 ONAP
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.sli.core.dblib.factory;
+
+
+import java.sql.SQLException;
+import java.util.Set;
+import java.util.concurrent.Callable;
+
+import org.onap.ccsdk.sli.core.dblib.CachedDataSource;
+import org.onap.ccsdk.sli.core.dblib.CachedDataSourceFactory;
+import org.onap.ccsdk.sli.core.dblib.DBConfigException;
+import org.onap.ccsdk.sli.core.dblib.DBResourceManager;
+import org.onap.ccsdk.sli.core.dblib.config.BaseDBConfiguration;
+import org.onap.ccsdk.sli.core.dblib.config.DbConfigPool;
+import org.onap.ccsdk.sli.core.dblib.config.JDBCConfiguration;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @version $Revision: 1.6 $
+ * Change Log
+ * Author         Date     Comments
+ * ============== ======== ====================================================
+ * Rich Tabedzki
+ */
+public abstract class AbstractResourceManagerFactory {
+	private static Logger LOGGER = LoggerFactory.getLogger(AbstractResourceManagerFactory.class);
+
+	public abstract CachedDataSource[] initDBResourceManager(DbConfigPool dbConfig, DBResourceManager manager) throws Exception;
+	public abstract CachedDataSource[] initDBResourceManager(DbConfigPool dbConfig,	DBResourceManager dbResourceManager, String sourceName) throws SQLException ;
+
+
+	public static AbstractResourceManagerFactory createIntstance() throws FactoryNotDefinedException {
+		throw new FactoryNotDefinedException("Factory method 'createIntstance' needs to be overriden in DBResourceManagerFactory");
+	}
+
+	public class DBInitTask implements Callable<CachedDataSource>
+	{
+		private BaseDBConfiguration config = null;
+		private Set<DBInitTask> activeTasks;
+
+		public DBInitTask(JDBCConfiguration jdbcconfig, Set<DBInitTask> tasks) {
+			this.config = jdbcconfig;
+			this.activeTasks = tasks;
+		}
+
+		public CachedDataSource call() throws Exception {
+			CachedDataSource ds = null;
+			try {
+				ds = CachedDataSourceFactory.createDataSource(config);
+				return ds;
+			} finally {
+				synchronized(activeTasks) {
+					activeTasks.remove(this);
+					if (activeTasks.isEmpty()) {
+						final Runnable closure = new Runnable() {
+
+							public void run() {
+								try {
+									Thread.sleep(300);
+								} catch (Exception e) {
+								}
+								synchronized(activeTasks) {
+									activeTasks.notifyAll();
+								}
+							}
+						};
+						if (LOGGER.isDebugEnabled()) {
+							LOGGER.debug("Completed CachedDataSource.Call and notifyAll from " + ds.getDbConnectionName());
+						}
+						Thread worker = new Thread(closure);
+						worker.setDaemon(true);
+						worker.start();
+					} else {
+						if (LOGGER.isDebugEnabled()) {
+							if (ds != null) {
+								LOGGER.debug("Completed CachedDataSource.Call from " + ds.getDbConnectionName());
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+}
diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/DBConfigFactory.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/DBConfigFactory.java
new file mode 100644
index 00000000..3caa7767
--- /dev/null
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/DBConfigFactory.java
@@ -0,0 +1,99 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * onap
+ * ================================================================================
+ * Copyright (C) 2016 - 2017 ONAP
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.sli.core.dblib.factory;
+
+
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Properties;
+
+import org.onap.ccsdk.sli.core.dblib.config.BaseDBConfiguration;
+import org.onap.ccsdk.sli.core.dblib.config.DbConfigPool;
+import org.onap.ccsdk.sli.core.dblib.config.JDBCConfiguration;
+import org.slf4j.LoggerFactory;
+
+/**
+ * @version $Revision: 1.1 $
+ * Change Log
+ * Author         Date     Comments
+ * ============== ======== ====================================================
+ * Rich Tabedzki  01/17/08 Initial version
+ */
+public class DBConfigFactory {
+
+	public static DbConfigPool createConfig(Properties resource) {
+		return getConfigparams(resource);
+	}
+
+	static DbConfigPool getConfigparams(Properties properties){
+		DbConfigPool xmlConfig = new DbConfigPool(properties);
+		ArrayList<Properties> propertySets = new ArrayList<Properties>();
+
+		if("JDBC".equalsIgnoreCase(xmlConfig.getType())) {
+			String hosts = properties.getProperty(BaseDBConfiguration.DATABASE_HOSTS);
+			if(hosts == null || hosts.isEmpty()) {
+				propertySets.add(properties);
+			} else {
+				String[] newhost = hosts.split(",");
+				for(int i=0; i< newhost.length; i++) {
+					Properties localset = new Properties();
+					localset.putAll(properties);
+					String url = localset.getProperty(BaseDBConfiguration.DATABASE_URL);
+					if(url.contains("DBHOST"))
+						url = url.replace("DBHOST", newhost[i]);
+					if(url.contains("dbhost"))
+						url = url.replace("dbhost", newhost[i]);
+					localset.setProperty(BaseDBConfiguration.DATABASE_URL, url);
+					localset.setProperty(BaseDBConfiguration.CONNECTION_NAME, newhost[i]);
+					propertySets.add(localset);
+				}
+			}
+		} else {
+			propertySets.add(properties);
+		}
+		try {
+			Iterator<Properties>  it = propertySets.iterator();
+			while(it.hasNext()) {
+				BaseDBConfiguration config = parse(it.next());
+				xmlConfig.addConfiguration(config);
+			}
+
+		} catch (Exception e) {
+			LoggerFactory.getLogger(DBConfigFactory.class).warn("",e);
+		}
+
+		return xmlConfig;
+	}
+
+	public static BaseDBConfiguration parse(Properties props) throws Exception {
+
+		String type = props.getProperty(BaseDBConfiguration.DATABASE_TYPE);
+
+		BaseDBConfiguration config = null;
+
+		if("JDBC".equalsIgnoreCase(type)) {
+			config = new JDBCConfiguration(props);
+		}
+
+		return config;
+
+	}
+}
diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/FactoryNotDefinedException.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/FactoryNotDefinedException.java
new file mode 100644
index 00000000..b6383a53
--- /dev/null
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/factory/FactoryNotDefinedException.java
@@ -0,0 +1,37 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * onap
+ * ================================================================================
+ * Copyright (C) 2016 - 2017 ONAP
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.ccsdk.sli.core.dblib.factory;
+
+
+/**
+ * @version 1.3
+ * Change Log
+ * Author         Date     Comments
+ * ============== ======== ====================================================
+ * Rich Tabedzki  01/16/08 Initial version
+ */
+public class FactoryNotDefinedException extends Exception {
+
+	public FactoryNotDefinedException(String message) {
+		super(message);
+	}
+
+}