summaryrefslogtreecommitdiffstats
path: root/appc-dg/appc-dg-shared
diff options
context:
space:
mode:
Diffstat (limited to 'appc-dg/appc-dg-shared')
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/AbstractResolverDataReader.java41
-rw-r--r--appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/DataReaderException.java32
2 files changed, 52 insertions, 21 deletions
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/AbstractResolverDataReader.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/AbstractResolverDataReader.java
index c5fe87c77..19e2a5c37 100644
--- a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/AbstractResolverDataReader.java
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/AbstractResolverDataReader.java
@@ -49,7 +49,7 @@ abstract class AbstractResolverDataReader {
try {
return resultSet.next();
} catch (SQLException e) {
- throw new RuntimeException(e);
+ throw new DataReaderException(e);
}
}
@@ -68,7 +68,7 @@ abstract class AbstractResolverDataReader {
try {
return resultSet.getObject(name);
} catch (SQLException e) {
- throw new RuntimeException(e);
+ throw new DataReaderException(e);
}
}
@@ -77,7 +77,7 @@ abstract class AbstractResolverDataReader {
try {
return new FlowKey(resultSet.getString("dg_name"), resultSet.getString("dg_version"), resultSet.getString("dg_module"));
} catch (SQLException e) {
- throw new RuntimeException(e);
+ throw new DataReaderException(e);
}
}
}
@@ -88,13 +88,8 @@ abstract class AbstractResolverDataReader {
@Override
public Iterable<ConfigurationEntry<FlowKey>> getEntries() {
- return new Iterable<ConfigurationEntry<FlowKey>>() {
- @Override
- public Iterator<ConfigurationEntry<FlowKey>> iterator() {
- return new ResultSetIterator();
- }
- };
+ return ResultSetIterator::new;
}
@Override
@@ -111,20 +106,24 @@ abstract class AbstractResolverDataReader {
RankedAttributesResolver<FlowKey> read() {
try {
try (Connection conn = DBUtils.getConnection("sdnctl")) {
- try (PreparedStatement stmt = conn.prepareStatement(getQueryStmt())) {
- try (ResultSet res = stmt.executeQuery()) {
- if (res.next()) {
- res.beforeFirst();
- ConfigurationSet<FlowKey> resolverConfig = new ConfigurationSetAdaptor(res);
- return AbstractRankedAttributesResolverFactory.getInstance().create(resolverConfig);
- } else {
- throw new IllegalStateException();
- }
- }
- }
+ return getFlowKeyRankedAttributesResolver(conn);
}
} catch (SQLException e) {
- throw new RuntimeException(e);
+ throw new DataReaderException(e);
+ }
+ }
+
+ private RankedAttributesResolver<FlowKey> getFlowKeyRankedAttributesResolver(Connection conn) throws SQLException {
+ try (PreparedStatement stmt = conn.prepareStatement(getQueryStmt())) {
+ try (ResultSet res = stmt.executeQuery()) {
+ if (res.next()) {
+ res.beforeFirst();
+ ConfigurationSet<FlowKey> resolverConfig = new ConfigurationSetAdaptor(res);
+ return AbstractRankedAttributesResolverFactory.getInstance().create(resolverConfig);
+ } else {
+ throw new IllegalStateException();
+ }
+ }
}
}
}
diff --git a/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/DataReaderException.java b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/DataReaderException.java
new file mode 100644
index 000000000..8c97092b3
--- /dev/null
+++ b/appc-dg/appc-dg-shared/appc-dg-common/src/main/java/org/onap/appc/dg/common/impl/DataReaderException.java
@@ -0,0 +1,32 @@
+/*-
+ * ============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.dg.common.impl;
+
+public class DataReaderException extends RuntimeException{
+
+ public DataReaderException(Throwable cause) {
+ super(cause);
+ }
+}