summaryrefslogtreecommitdiffstats
path: root/dblib
diff options
context:
space:
mode:
authorDan Timoney <dtimoney@att.com>2017-09-19 17:33:48 -0400
committerDan Timoney <dtimoney@att.com>2017-09-19 17:33:52 -0400
commit5469072378877daa9e9d709fa0f49bacc04e3e1d (patch)
tree887ba08d883c1c61bb4543ec420e566450560257 /dblib
parentbf1341964ef9dd831992e4187eb09059abb3c8ba (diff)
Remove mysql dependencies in sli/core
Remove lingering mysql dependencies in sli/core, which prevented odlsli container from starting up clean. Note: tested this using bareodl container and verified that these changes install clean AFTER changing incorrect driver property name in dblib.properties. This patch is fine, but a second patch to ccsdk/distribution is needed to fix that property file. Change-Id: I6a900d1c29998867bfbae29d5e113c4e392a8bb9 Issue-ID: CCSDK-95 Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'dblib')
-rwxr-xr-xdblib/features/src/main/resources/features.xml2
-rwxr-xr-xdblib/provider/pom.xml5
-rw-r--r--dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/jdbc/MySQLCachedDataSource.java216
3 files changed, 1 insertions, 222 deletions
diff --git a/dblib/features/src/main/resources/features.xml b/dblib/features/src/main/resources/features.xml
index 36d794139..aa31db751 100755
--- a/dblib/features/src/main/resources/features.xml
+++ b/dblib/features/src/main/resources/features.xml
@@ -12,7 +12,7 @@
<feature version="${odl.mdsal.version}">odl-mdsal-broker</feature>
<bundle>wrap:mvn:org.apache.tomcat/tomcat-jdbc/${tomcat-jdbc.version}/$DynamicImport-Package=org.mariadb.*&amp;overwrite=merge</bundle>
<bundle>mvn:org.onap.ccsdk.sli.core/dblib-provider/${project.version}</bundle>
- <bundle>mvn:org/mariadb/jdbc/mariadb-java-client/${mariadb.connector.version}</bundle>
+ <bundle>mvn:org.mariadb.jdbc/mariadb-java-client/${mariadb.connector.version}</bundle>
</feature>
</features>
diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml
index 765f73798..8ff109417 100755
--- a/dblib/provider/pom.xml
+++ b/dblib/provider/pom.xml
@@ -42,11 +42,6 @@
<version>${slf4j.version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.connector.version}</version>
- </dependency>
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
diff --git a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/jdbc/MySQLCachedDataSource.java b/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/jdbc/MySQLCachedDataSource.java
deleted file mode 100644
index bea0d631f..000000000
--- a/dblib/provider/src/main/java/org/onap/ccsdk/sli/core/dblib/jdbc/MySQLCachedDataSource.java
+++ /dev/null
@@ -1,216 +0,0 @@
-/*-
- * ============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.jdbc;
-
-import java.sql.SQLFeatureNotSupportedException;
-import java.util.Properties;
-
-import org.onap.ccsdk.sli.core.dblib.CachedDataSource;
-import org.onap.ccsdk.sli.core.dblib.DBConfigException;
-import org.onap.ccsdk.sli.core.dblib.config.BaseDBConfiguration;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
-
-
-
-
-/**
- * @version $Revision: 1.7 $
- * Change Log
- * Author Date Comments
- * ============== ======== ====================================================
- * Rich Tabedzki
- */
-
-public class MySQLCachedDataSource extends CachedDataSource
-{
- private String dbUserId;
- private String dbPasswd;
- private String dbUrl;
-
- private String minLimit;
- private String maxLimit;
- private String initialLimit;
-
- private static final String AS_CONF_ERROR = "AS_CONF_ERROR: ";
-
- private static Logger LOGGER = LoggerFactory.getLogger(MySQLCachedDataSource.class);
-
- /**
- * @param jdbcElem
- */
- public MySQLCachedDataSource(BaseDBConfiguration jdbcElem)
- {
- super(jdbcElem);
- }
-
- @Override
- protected void configure(BaseDBConfiguration xmlElem) throws DBConfigException
- {
- BaseDBConfiguration jdbcConfig = (BaseDBConfiguration)xmlElem;
- if(jdbcConfig.getConnTimeout() > 0){
- this.CONN_REQ_TIMEOUT = jdbcConfig.getConnTimeout();
- }
- if(jdbcConfig.getRequestTimeout() > 0){
- this.DATA_REQ_TIMEOUT = jdbcConfig.getRequestTimeout();
- }
-
- // set connection pool name
- String dbConnectionName = jdbcConfig.getDbConnectionName();
- super.setDbConnectionName(dbConnectionName);
- // Configure the JDBC connection
- dbUserId = jdbcConfig.getDbUserId();
- if (dbUserId == null)
- {
- String errorMsg = "Invalid XML contents: JDBCConnection missing dbUserId attribute";
- LOGGER.error(AS_CONF_ERROR + errorMsg);
- throw new DBConfigException(errorMsg);
- }
-
- dbPasswd = jdbcConfig.getDbPasswd();
- if (dbPasswd == null)
- {
- String errorMsg = "Invalid XML contents: JDBCConnection missing dbPasswd attribute";
- LOGGER.error(AS_CONF_ERROR + errorMsg);
- throw new DBConfigException(errorMsg);
- }
- /*
- dbDriver = jdbcConfig.getDbDriver();
- if (dbDriver == null)
- {
- String errorMsg = "Invalid XML contents: JDBCConnection missing dbDriver attribute";
- LOGGER.error(AS_CONF_ERROR + errorMsg);
- throw new ScpTblUpdateError(errorMsg);
- }
- */
-
- minLimit = Integer.toString(jdbcConfig.getDbMinLimit());
- if (minLimit == null)
- {
- String errorMsg = "Invalid XML contents: JDBC Connection missing minLimit attribute";
- LOGGER.error(AS_CONF_ERROR + errorMsg);
- throw new DBConfigException(errorMsg);
- }
- maxLimit = Integer.toString(jdbcConfig.getDbMaxLimit());
- if (maxLimit == null)
- {
- String errorMsg = "Invalid XML contents: JDBC Connection missing maxLimit attribute";
- LOGGER.error(AS_CONF_ERROR + errorMsg);
- throw new DBConfigException(errorMsg);
- }
- initialLimit = Integer.toString(jdbcConfig.getDbInitialLimit());
- if (initialLimit == null)
- {
- String errorMsg = "Invalid XML contents: JDBC Connection missing initialLimit attribute";
- LOGGER.error(AS_CONF_ERROR + errorMsg);
- throw new DBConfigException(errorMsg);
- }
-
- dbUrl = jdbcConfig.getDbUrl();
- if(dbUrl == null){
- String errorMsg = "Invalid XML contents: JDBCConnection missing dbUrl attribute";
- LOGGER.error(AS_CONF_ERROR + errorMsg);
- throw new DBConfigException(errorMsg);
- }
-
- try {
-
- MysqlDataSource dataSource = new MysqlDataSource();
- dataSource.setUser(dbUserId);
- dataSource.setPassword(dbPasswd);
- dataSource.setURL(dbUrl);
-// dataSource.setInitialSize(5);
-// dataSource.setMaxTotal(60);
-// dataSource.setMaxActive(100);
-// dataSource.setMaxWait(10000);
-// dataSource.setMaxIdle(10);
-
- Properties connAttr = new Properties();
-
- connAttr.setProperty("MinLimit", minLimit);
- connAttr.setProperty("MaxLimit", maxLimit);
- connAttr.setProperty("InitialLimit", initialLimit);
- connAttr.setProperty("TRANSACTION_ISOLATION","SERIALIZABLE");
- connAttr.setProperty("CONNECTION_TAG", dbConnectionName.toUpperCase()+"_CONNECTION");
- connAttr.setProperty("InactivityTimeout", "900");
- connAttr.setProperty("AbandonedConnectionTimeout", "600");
- connAttr.setProperty("PropertyCheckInterval", "60");
- connAttr.setProperty("ValidateConnection", "true");
-
-
- synchronized(this)
- {
- this.ds = dataSource;
-
- initialized = true;
- LOGGER.info("MySQLDataSource <"+dbConnectionName+"> configured successfully. Using URL: "+dbUrl);
- }
-
-// } catch (SQLException exc) {
-// initialized = false;
-// StringBuffer sb = new StringBuffer();
-// sb.append("Failed to initialize MySQLDataSource<");
-// sb.append(dbConnectionName).append(">. Reason: ");
-// sb.append(exc.getMessage());
-// LOGGER.error("AS_CONF_ERROR: " + sb.toString());
-//// throw new DBConfigException(e.getMessage());
- } catch (Exception exc) {
- initialized = false;
- StringBuffer sb = new StringBuffer();
- sb.append("Failed to initialize MySQLCachedDataSource <");
- sb.append(dbConnectionName).append(">. Reason: ");
- sb.append(exc.getMessage());
- LOGGER.error("AS_CONF_ERROR: " + sb.toString());
-// throw new DBConfigException(e.getMessage());
- }
- }
-
- public final String getDbUrl()
- {
- return dbUrl;
- }
-
- public final String getDbUserId()
- {
- return dbUserId;
- }
-
- public final String getDbPasswd()
- {
- return dbPasswd;
- }
-
- public static MySQLCachedDataSource createInstance(BaseDBConfiguration config) /*throws Exception*/ {
- return new MySQLCachedDataSource(config);
- }
-
- public String toString(){
- return getDbConnectionName();
- }
-
- public java.util.logging.Logger getParentLogger()
- throws SQLFeatureNotSupportedException {
- // TODO Auto-generated method stub
- return null;
- }
-}