Fortify, version, Junit

Issue-ID: PORTAL-543, PORTAL-273, PORTAL-544
Change-Id: Ib864ef78bbd534170cab90d9314f2d8943f78872
Signed-off-by: Thota, Saisree <st398c@research.att.com>

1 files changed, 31 insertions, 0 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/DbUtils.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/DbUtils.java
index e179d388..37d3612c 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/DbUtils.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/DbUtils.java
@@ -39,6 +39,7 @@ package org.onap.portalsdk.analytics.system;
 
 import java.sql.CallableStatement;
 import java.sql.Connection;
+import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -46,6 +47,7 @@ import java.sql.Types;
 
 import javax.sql.DataSource;
 
+import org.apache.commons.lang3.StringUtils;
 import org.onap.portalsdk.analytics.error.RaptorException;
 import org.onap.portalsdk.analytics.error.ReportSQLException;
 import org.onap.portalsdk.analytics.model.runtime.ReportRuntime;
@@ -200,6 +202,35 @@ public class DbUtils {
 			throw new ReportSQLException(e.getMessage(), sql);
 		}
 	} // executeQuery
+	
+	public static DataSet executeQuery(String sql, String reportName, String reportID) throws ReportSQLException  {
+		Connection con = null;
+        try {
+    		con = getConnection();
+    		PreparedStatement preparedStatement = con.prepareStatement(sql);
+    		if(StringUtils.isNotBlank(reportID)) {
+    			preparedStatement.setString(1, reportID);
+    			preparedStatement.setString(2, reportName);
+    		}else {
+    			preparedStatement.setString(1, reportName);
+    		}
+    		
+    		try(ResultSet rs = preparedStatement.executeQuery();)
+			{
+			    logger.debug(EELFLoggerDelegate.debugLogger, ("[SQL CALL FROM RAPTOR] [SQL] " + sql));
+			    return new DataSet(rs,  Integer.MAX_VALUE);
+			}
+		} catch (SQLException e) {
+			throw new ReportSQLException(e.getMessage(), sql);
+		} catch (ReportSQLException ex) {
+        	logger.error(EELFLoggerDelegate.debugLogger, ("Error " + sql));
+        	throw new ReportSQLException(ex.getMessage(), ex);
+        }catch(Exception ex1) {
+        	throw new ReportSQLException(ex1.getMessage(), ex1.getCause());
+        } finally {
+            clearConnection(con);
+        } 
+	} // executeQuery
 
 	public static DataSet executeQuery(String sql) throws ReportSQLException  {
 		return executeQuery(sql, Integer.MAX_VALUE);