diff options
| author |   Dan Timoney <dtimoney@att.com> | 2017-04-20 17:02:24 -0400 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2017-04-21 15:10:39 -0400 |
| commit | a5577ac18e488ed1870994b2d8f63ad01f38414d (patch) | |
| tree | 9092da35397213a0c3663b516f9a2b01b4216d24 /dblib | |
| parent | 18b2a034ab378b96cec231b76536018aa3d62968 (diff) | |
[SDNC-5] Boron port and bug fixes
Changes to support Boron as well as bug fixes discovered during initial testing.
Change-Id: Ic6c156c8fe884a6a3bccc19d0676da312be8a4c2
Signed-off-by: Dan Timoney <dtimoney@att.com>
Diffstat (limited to 'dblib')
3 files changed, 4 insertions, 10 deletions
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/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) { |