aboutsummaryrefslogtreecommitdiffstats
path: root/appc-dispatcher/appc-dispatcher-common
diff options
context:
space:
mode:
Diffstat (limited to 'appc-dispatcher/appc-dispatcher-common')
-rw-r--r--appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/AppcDatabaseConnectionPool.java20
-rw-r--r--appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/PropertyPattern.java42
-rw-r--r--appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/test/java/org/onap/appc/dao/util/AppcDatabaseConnectionPoolTest.java41
3 files changed, 82 insertions, 21 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 219739755..958001cd6 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
@@ -9,9 +9,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.
@@ -48,22 +48,6 @@ import java.util.Map;
* An example is shown in the {@link DBConnectionPoolService}
*/
public class AppcDatabaseConnectionPool implements DBConnectionPoolService {
- enum PropertyPattern {
- DBURL("org.onap.appc.db.url.%s"),
- USERNAME("org.onap.appc.db.user.%s"),
- PASSWORD("org.onap.appc.db.pass.%s"),
- DRIVER("org.onap.appc.db.jdbc.driver");
-
- private String pattern;
-
- PropertyPattern(String pattern) {
- this.pattern = pattern;
- }
-
- public String getPattern() {
- return pattern;
- }
- }
private final EELFLogger logger = EELFManager.getInstance().getLogger(AppcDatabaseConnectionPool.class);
diff --git a/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/PropertyPattern.java b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/PropertyPattern.java
new file mode 100644
index 000000000..f02e50c6a
--- /dev/null
+++ b/appc-dispatcher/appc-dispatcher-common/appc-data-access-lib/src/main/java/org/onap/appc/dao/util/PropertyPattern.java
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP : APPC
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Copyright (C) 2017 Amdocs
+ * =============================================================================
+ * 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.
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.appc.dao.util;
+
+public enum PropertyPattern {
+ DBURL("org.onap.appc.db.url.%s"),
+ USERNAME("org.onap.appc.db.user.%s"),
+ PASSWORD("org.onap.appc.db.pass.%s"),
+ DRIVER("org.onap.appc.db.jdbc.driver");
+
+ private String pattern;
+
+ PropertyPattern(String pattern) {
+ this.pattern = pattern;
+ }
+
+ public String getPattern() {
+ return pattern;
+ }
+} \ No newline at end of file
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 faee99d84..c3eada847 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
@@ -9,15 +9,15 @@
* 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.
- *
+ *
* ECOMP is a trademark and service mark of AT&T Intellectual Property.
* ============LICENSE_END=========================================================
*/
@@ -81,6 +81,41 @@ public class AppcDatabaseConnectionPoolTest {
}
@Test
+ public void testDBURL() {
+ String dbString;
+
+ dbString = PropertyPattern.DBURL.getPattern();
+ dbString = String.format(dbString, "test");
+ Assert.assertEquals("org.onap.appc.db.url.test", dbString);
+ }
+
+ @Test
+ public void testUSERNAME() {
+ String dbString;
+
+ dbString = PropertyPattern.USERNAME.getPattern();
+ dbString = String.format(dbString, "test");
+ Assert.assertEquals("org.onap.appc.db.user.test", dbString);
+ }
+
+ @Test
+ public void testPASSWORD() {
+ String dbString;
+
+ dbString = PropertyPattern.PASSWORD.getPattern();
+ dbString = String.format(dbString, "test");
+ Assert.assertEquals("org.onap.appc.db.pass.test", dbString);
+ }
+
+ @Test
+ public void testDRIVER() {
+ String dbString;
+
+ dbString = PropertyPattern.DRIVER.getPattern();
+ Assert.assertEquals("org.onap.appc.db.jdbc.driver", dbString);
+ }
+
+ @Test
public void testArgumentConstructor() {
AppcDatabaseConnectionPool appcDatabaseConnectionPool = new AppcDatabaseConnectionPool(dbUrl, username,
password, driver);