diff options
Diffstat (limited to 'appc-dispatcher/appc-dispatcher-common/appc-data-access-lib')
5 files changed, 32 insertions, 39 deletions
diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/AppcDatabaseConnectionPool.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/AppcDatabaseConnectionPool.java index 1f4a75911..2a1484c2d 100644 --- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/AppcDatabaseConnectionPool.java +++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/AppcDatabaseConnectionPool.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP : APPC * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Copyright (C) 2017 Amdocs * ================================================================================ @@ -19,7 +19,6 @@ * 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========================================================= */ @@ -41,8 +40,8 @@ import java.util.Map; * This class implements * * @see org.onap.appc.dao.util.dbcp.DBConnectionPool - * that provides concrete implemenation of accessing appc database which basic setup - * data would be got from global configuration. + * that provides a concrete implementation of appc database access + * with basic setup data extracted from the global configuration. * @see org.onap.appc.configuration.Configuration * <p> * The singleton instance of this class has been instantiated by blueprint. @@ -88,8 +87,8 @@ public class AppcDatabaseConnectionPool implements DBConnectionPoolService { try { connection = dbConnectionPool.getConnection(); } catch (DBConnectionPoolException e) { - logger.error("DB connection pool is created failed." + - "Please make sure the provided information is correct."); + logger.error("DB connection pool creation failed." + + " Please make sure the provided information is correct."); } if (connection != null) { diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/api/DBConnectionPoolService.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/api/DBConnectionPoolService.java index 6f51fec3c..0a163544d 100644 --- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/api/DBConnectionPoolService.java +++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/api/DBConnectionPoolService.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP : APPC * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Copyright (C) 2017 Amdocs * ================================================================================ @@ -11,15 +11,14 @@ * 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========================================================= */ @@ -45,10 +44,10 @@ import java.util.Map; * <blockquote><pre> * {@code * private AppcDatabaseConnectionPool pool; - * public void setAppcDatabaseConnectionPool(AppcDatabaseConnectionPool pool){ + * public void setAppcDatabaseConnectionPool(AppcDatabaseConnectionPool pool) { * this.pool = pool; * } - * public queryAppcDatabase(AppcDatabaseConnectionPool pool){ + * public queryAppcDatabase(AppcDatabaseConnectionPool pool) { * Connection connection = null; * try { * connection = pool.getConnection(); @@ -64,11 +63,11 @@ import java.util.Map; * System.out.println("# of entries in db:"); * int numcols = rs.getMetaData().getColumnCount(); * System.out.println(pool.getDataSourceStatus()); - * }catch (SQLException e) { + * } catch (SQLException e) { * e.printStackTrace(); * } finally { * try { - * pool.close(rs, stmt, conn); + * pool.close(rs, stmt, conn); * } catch (DataAccessException e) { * e.printStackTrace(); * } diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/dbcp/DBConnectionPool.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/dbcp/DBConnectionPool.java index d201f399c..5381721ea 100644 --- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/dbcp/DBConnectionPool.java +++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/dbcp/DBConnectionPool.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP : APPC * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Copyright (C) 2017 Amdocs * ================================================================================ @@ -11,15 +11,14 @@ * 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========================================================= */ @@ -63,11 +62,10 @@ public class DBConnectionPool implements DBConnectionPoolService { this(connectURI, username, password, driverClass, null, null, null, null, null); } - public DBConnectionPool(String connectURI, String username, String password, - String driverClass, Integer initialSize, Integer maxActive, - Integer maxIdle, Integer maxWait, Integer minIdle) { + public DBConnectionPool(String connectURI, String username, String password, String driverClass, + Integer initialSize, Integer maxActive, Integer maxIdle, Integer maxWait, Integer minIdle) { this.dataSource = getBasicDataSource(connectURI, username, password, driverClass, - initialSize, maxActive, maxIdle, maxWait, minIdle); + initialSize, maxActive, maxIdle, maxWait, minIdle); } /** @@ -87,8 +85,8 @@ public class DBConnectionPool implements DBConnectionPoolService { throw new DBConnectionPoolException(e); } - if(connection == null){ - // + if (connection == null) { + // Don't necessarily know why, but can report. . . . throw new DBConnectionPoolException("Connection was not created"); } @@ -125,8 +123,8 @@ public class DBConnectionPool implements DBConnectionPoolService { } protected BasicDataSource getBasicDataSource(String connectURI, String username, String password, - String driverClass, Integer initialSize, Integer maxtotal, - Integer maxIdle, Integer maxWaitMillis, Integer minIdle) { + String driverClass, Integer initialSize, Integer maxTotal, Integer maxIdle, Integer maxWaitMillis, + Integer minIdle) { BasicDataSource dataSource = new BasicDataSource(); dataSource.setDriverClassName(driverClass); dataSource.setUsername(username); @@ -136,8 +134,8 @@ public class DBConnectionPool implements DBConnectionPoolService { if (initialSize != null) { dataSource.setInitialSize(initialSize); } - if (maxtotal != null) { - dataSource.setMaxTotal(maxtotal); + if (maxTotal != null) { + dataSource.setMaxTotal(maxTotal); } if (maxIdle != null) { dataSource.setMaxIdle(maxIdle); diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/test/java/org/onap/appc/dao/util/AppcDatabaseConnectionPoolTest.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/test/java/org/onap/appc/dao/util/AppcDatabaseConnectionPoolTest.java index ad1b4ea0f..98ef98ab8 100644 --- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/test/java/org/onap/appc/dao/util/AppcDatabaseConnectionPoolTest.java +++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/test/java/org/onap/appc/dao/util/AppcDatabaseConnectionPoolTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP : APPC * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Copyright (C) 2017 Amdocs * ================================================================================ @@ -19,7 +19,6 @@ * 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========================================================= */ @@ -106,8 +105,8 @@ public class AppcDatabaseConnectionPoolTest { @Test public void testArgumentConstructor() { - AppcDatabaseConnectionPool appcDatabaseConnectionPool = new AppcDatabaseConnectionPool(dbUrl, username, - password, driver); + AppcDatabaseConnectionPool appcDatabaseConnectionPool = + new AppcDatabaseConnectionPool(dbUrl, username, password, driver); Object dbConnectionPool = Whitebox.getInternalState(appcDatabaseConnectionPool, "dbConnectionPool"); Assert.assertNotNull(dbConnectionPool); } diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/test/java/org/onap/appc/dao/util/dbcp/DBConnectionPoolTest.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/test/java/org/onap/appc/dao/util/dbcp/DBConnectionPoolTest.java index d2ac778a4..a26f8c037 100644 --- a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/test/java/org/onap/appc/dao/util/dbcp/DBConnectionPoolTest.java +++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/test/java/org/onap/appc/dao/util/dbcp/DBConnectionPoolTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP : APPC * ================================================================================ - * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2017-2019 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Copyright (C) 2017 Amdocs * ================================================================================ @@ -11,15 +11,14 @@ * 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========================================================= */ @@ -39,7 +38,6 @@ import java.sql.Connection; import java.sql.SQLException; import java.util.Map; - public class DBConnectionPoolTest { private final String connectURI = "jdbc:h2:mem:~/test;MODE=MYSQL;DB_CLOSE_DELAY=-1"; private final String username = "sa"; @@ -104,8 +102,8 @@ public class DBConnectionPoolTest { @Test public void testShutdownException() throws SQLException { - DBConnectionPool dbcpSpy = Mockito.spy(new DBConnectionPool(connectURI, username, password, driverClass, - 0, 0, 0, 0, 0)); + DBConnectionPool dbcpSpy = + Mockito.spy(new DBConnectionPool(connectURI, username, password, driverClass, 0, 0, 0, 0, 0)); BasicDataSource mockDataSource = Mockito.mock(BasicDataSource.class); Mockito.doThrow(new SQLException()).when(mockDataSource).close(); Whitebox.setInternalState(dbcpSpy, "dataSource", mockDataSource); |