From: Arindam Mondal <arind.mondal@samsung.com>
Date: Thu, 20 Sep 2018 10:51:53 +0000 (+0900)
Subject: Fix try-with-resources
X-Git-Tag: 1.0.0~29
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F55%2F68055%2F1;p=dcaegen2%2Fservices%2Fmapper.git

Fix try-with-resources

Issue-ID: DCAEGEN2-818

Change-Id: I7d8afc8bb78c9534671602ed37db7f6d14f5de81
Signed-off-by: arind.mondal <arind.mondal@samsung.com>
---

diff --git a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java
index ca1bcc9..b63eb1e 100644
--- a/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java
+++ b/UniversalVesAdapter/src/main/java/org/onap/universalvesadapter/service/VESAdapterInitializer.java
@@ -147,10 +147,9 @@ public class VESAdapterInitializer implements CommandLineRunner, Ordered {
 	}
 
 	public void fetchMappingFile() {
-		try (Connection con = DriverManager.getConnection(dBurl, user, pwd)) {
+		String query = "SELECT * FROM mapping_file";
+		try (Connection con = DriverManager.getConnection(dBurl, user, pwd);PreparedStatement pstmt = con.prepareStatement(query);ResultSet rs = pstmt.executeQuery();) {
 			LOGGER.info("Retrieving data from DB");
-			PreparedStatement pstmt = con.prepareStatement("SELECT * FROM mapping_file");
-			ResultSet rs = pstmt.executeQuery();
 			// parsing the column each time is a linear search
 			int column1Pos = rs.findColumn("enterpriseid");
 			int column2Pos = rs.findColumn("mappingfilecontents");