diff options
Diffstat (limited to 'dblib')
9 files changed, 14 insertions, 20 deletions
diff --git a/dblib/common/pom.xml b/dblib/common/pom.xml index fa25c98..722d99b 100755 --- a/dblib/common/pom.xml +++ b/dblib/common/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.openecomp.sdnc.core</groupId> <artifactId>dblib</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <artifactId>dblib-common</artifactId> <packaging>bundle</packaging> diff --git a/dblib/features/pom.xml b/dblib/features/pom.xml index 8111449..f6a4b7a 100755 --- a/dblib/features/pom.xml +++ b/dblib/features/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>dblib</artifactId> <groupId>org.openecomp.sdnc.core</groupId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <artifactId>dblib-features</artifactId> <name>DBLIB Adaptor - Features</name> diff --git a/dblib/installer/pom.xml b/dblib/installer/pom.xml index 08a92e1..0646479 100755 --- a/dblib/installer/pom.xml +++ b/dblib/installer/pom.xml @@ -4,7 +4,7 @@ <parent> <artifactId>dblib</artifactId> <groupId>org.openecomp.sdnc.core</groupId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <artifactId>dblib-installer</artifactId> <name>DBLIB Adaptor - Karaf Installer</name> diff --git a/dblib/pom.xml b/dblib/pom.xml index 5adb663..32127cb 100755 --- a/dblib/pom.xml +++ b/dblib/pom.xml @@ -3,7 +3,7 @@ <parent> <groupId>org.openecomp.sdnc.core</groupId> <artifactId>sdnc-core</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> @@ -16,7 +16,7 @@ <name>DBLIB Adaptor</name> <description>The DBLIB adaptor allows service logic to access persistent data in a local sql database</description> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <build> <plugins> diff --git a/dblib/provider/pom.xml b/dblib/provider/pom.xml index 913adf3..9d9340f 100755 --- a/dblib/provider/pom.xml +++ b/dblib/provider/pom.xml @@ -4,10 +4,10 @@ <parent> <groupId>org.openecomp.sdnc.core</groupId> <artifactId>dblib</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> </parent> <artifactId>dblib-provider</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.1-SNAPSHOT</version> <packaging>bundle</packaging> <name>DBLIB Adaptor - Provider</name> <url>http://maven.apache.org</url> diff --git a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/CachedDataSource.java b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/CachedDataSource.java index ee01c1b..58a0aeb 100644 --- a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/CachedDataSource.java +++ b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/CachedDataSource.java @@ -182,7 +182,7 @@ public abstract class CachedDataSource implements DataSource, SQLExecutionMonito data.populate(rs); // Point the rowset Cursor to the start if(LOGGER.isDebugEnabled()){ - LOGGER.debug("SQL SUCCESS. count=" + data.size()+ ", time(ms): "+ (System.currentTimeMillis() - time)); } + LOGGER.debug("SQL SUCCESS. rows returned: " + data.size()+ ", time(ms): "+ (System.currentTimeMillis() - time)); } } catch(SQLException exc){ if(LOGGER.isDebugEnabled()){ LOGGER.debug("SQL FAILURE. time(ms): "+ (System.currentTimeMillis() - time)); @@ -257,7 +257,7 @@ public abstract class CachedDataSource implements DataSource, SQLExecutionMonito rs = ps.executeUpdate(); // Point the rowset Cursor to the start if(LOGGER.isDebugEnabled()){ - LOGGER.debug("SQL SUCCESS. count=" + data.size()+ ", time(ms): "+ (System.currentTimeMillis() - time)); + LOGGER.debug("SQL SUCCESS. rows returned: " + data.size()+ ", time(ms): "+ (System.currentTimeMillis() - time)); } } catch(SQLException exc){ if(LOGGER.isDebugEnabled()){ diff --git a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/jdbc/JdbcDBCachedDataSource.java b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/jdbc/JdbcDBCachedDataSource.java index 42c3447..90c76f6 100644 --- a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/jdbc/JdbcDBCachedDataSource.java +++ b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/jdbc/JdbcDBCachedDataSource.java @@ -7,9 +7,9 @@ * 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. @@ -61,9 +61,6 @@ public class JdbcDBCachedDataSource extends CachedDataSource /** * @param jdbcElem - * @param alarmLog - * @param occManager - * @throws Exception */ public JdbcDBCachedDataSource(BaseDBConfiguration jdbcElem) { diff --git a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/jdbc/JdbcDbResourceManagerFactory.java b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/jdbc/JdbcDbResourceManagerFactory.java index 0afb621..84399df 100644 --- a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/jdbc/JdbcDbResourceManagerFactory.java +++ b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/jdbc/JdbcDbResourceManagerFactory.java @@ -55,11 +55,11 @@ public class JdbcDbResourceManagerFactory extends AbstractResourceManagerFactory } - class MyFutureTask extends FutureTask<DBInitTask> + class MyFutureTask extends FutureTask<CachedDataSource> { public MyFutureTask(Callable<CachedDataSource> result) { - super((Callable)result); + super(result); } } @@ -87,7 +87,7 @@ public class JdbcDbResourceManagerFactory extends AbstractResourceManagerFactory // here create the data sources objects JDBCConfiguration[] list = dbConfig.getJDBCbSourceArray(); - FutureTask<DBInitTask>[] futures = new MyFutureTask[list.length]; + MyFutureTask[] futures = new MyFutureTask[list.length]; final Set<DBInitTask> tasks = new HashSet<DBInitTask>(); if(LOGGER.isDebugEnabled()) { LOGGER.debug("Creating " + list.length + " datasources."); diff --git a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/jdbc/MySQLCachedDataSource.java b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/jdbc/MySQLCachedDataSource.java index ebfd473..a5482d0 100644 --- a/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/jdbc/MySQLCachedDataSource.java +++ b/dblib/provider/src/main/java/org/openecomp/sdnc/sli/resource/dblib/jdbc/MySQLCachedDataSource.java @@ -59,9 +59,6 @@ public class MySQLCachedDataSource extends CachedDataSource /** * @param jdbcElem - * @param alarmLog - * @param occManager - * @throws Exception */ public MySQLCachedDataSource(BaseDBConfiguration jdbcElem) { |