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>

3 files changed, 191 insertions, 0 deletions

diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/BaseDBConfiguration.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/BaseDBConfiguration.java
new file mode 100644
index 00000000..4b738d42
--- /dev/null
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/BaseDBConfiguration.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.config;
+
+import java.util.Properties;
+
+public abstract class BaseDBConfiguration {
+	public static final String DATABASE_TYPE	= "org.onap.ccsdk.sli.dbtype";
+	public static final String DATABASE_URL		= "org.onap.ccsdk.sli.jdbc.url";
+	public static final String DATABASE_NAME	= "org.onap.ccsdk.sli.jdbc.database";
+	public static final String CONNECTION_NAME	= "org.onap.ccsdk.sli.jdbc.connection.name";
+	public static final String DATABASE_USER 	= "org.onap.ccsdk.sli.jdbc.user";
+	public static final String DATABASE_PSSWD	= "org.onap.ccsdk.sli.jdbc.password";
+	public static final String CONNECTION_TIMEOUT="org.onap.ccsdk.sli.jdbc.connection.timeout";
+	public static final String REQUEST_TIMEOUT	= "org.onap.ccsdk.sli.jdbc.request.timeout";
+	public static final String MIN_LIMIT		= "org.onap.ccsdk.sli.jdbc.limit.min";
+	public static final String MAX_LIMIT		= "org.onap.ccsdk.sli.jdbc.limit.max";
+	public static final String INIT_LIMIT		= "org.onap.ccsdk.sli.jdbc.limit.init";
+	public static final String DATABASE_HOSTS   = "org.onap.ccsdk.sli.jdbc.hosts";
+
+
+	protected final Properties props;
+
+	public BaseDBConfiguration(Properties properties) {
+		this.props = properties;
+	}
+
+	public int getConnTimeout() {
+		try {
+			String value = props.getProperty(CONNECTION_TIMEOUT);
+			return Integer.parseInt(value);
+		} catch(Exception exc) {
+			return -1;
+		}
+	}
+
+	public int getRequestTimeout() {
+		try {
+			String value = props.getProperty(REQUEST_TIMEOUT);
+			if(value == null)
+				return -1;
+			return Integer.parseInt(value);
+		} catch(Exception exc) {
+			return -1;
+		}
+	}
+
+	public String getDbConnectionName() {
+		return props.getProperty(CONNECTION_NAME);
+	}
+
+	public String getDatabaseName() {
+		return props.getProperty(DATABASE_NAME);
+	}
+
+	public String getDbUserId() {
+		return props.getProperty(DATABASE_USER);
+	}
+
+	public String getDbPasswd() {
+		return props.getProperty(DATABASE_PSSWD);
+	}
+
+	public int getDbMinLimit() {
+		String value = props.getProperty(MIN_LIMIT);
+		return Integer.parseInt(value);
+	}
+
+	public int getDbMaxLimit() {
+		String value = props.getProperty(MAX_LIMIT);
+		return Integer.parseInt(value);
+	}
+
+	public int getDbInitialLimit() {
+		String value = props.getProperty(INIT_LIMIT);
+		return Integer.parseInt(value);
+	}
+
+	public String getDbUrl() {
+		return props.getProperty(DATABASE_URL);
+	}
+
+	public String getServerGroup() {
+		return null;
+	}
+}
diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/DbConfigPool.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/DbConfigPool.java
new file mode 100644
index 00000000..21fdab24
--- /dev/null
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/DbConfigPool.java
@@ -0,0 +1,56 @@
+/*-
+ * ============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.config;
+
+import java.util.ArrayList;
+import java.util.Properties;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class DbConfigPool {
+	private static Logger LOGGER = LoggerFactory.getLogger(DbConfigPool.class);
+
+	private final String type;
+
+	private ArrayList<BaseDBConfiguration> configurations = new ArrayList<BaseDBConfiguration>();
+
+	public DbConfigPool(Properties properties) {
+		LOGGER.debug("Initializing DbConfigType");
+		type = properties.getProperty(BaseDBConfiguration.DATABASE_TYPE, "JDBC").toUpperCase();
+	}
+
+	public int getTimeout() {
+		// TODO Auto-generated method stub
+		return 0;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public JDBCConfiguration[] getJDBCbSourceArray() {
+		return configurations.toArray(new JDBCConfiguration[configurations.size()]);
+	}
+
+	public void addConfiguration(BaseDBConfiguration config) {
+		configurations.add(config);
+	}
+}
diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/JDBCConfiguration.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/JDBCConfiguration.java
new file mode 100644
index 00000000..fea10356
--- /dev/null
+++ b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/config/JDBCConfiguration.java
@@ -0,0 +1,31 @@
+/*-
+ * ============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.config;
+
+import java.util.Properties;
+
+public class JDBCConfiguration extends BaseDBConfiguration {
+
+	public JDBCConfiguration(Properties xmlElem) {
+		super(xmlElem);
+	}
+
+}