Merge "Raptor backend java API Code(Analytics), UI Code(Overlay) and pages component in os project"

1 files changed, 17 insertions, 2 deletions

diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java
index 5db298b8..dbc68008 100644
--- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java
+++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportSchedule.java
@@ -72,12 +72,16 @@ import org.onap.portalsdk.analytics.system.DbUtils;
 import org.onap.portalsdk.analytics.system.Globals;
 import org.onap.portalsdk.analytics.util.AppConstants;
 import org.onap.portalsdk.analytics.util.DataSet;
+import org.onap.portalsdk.analytics.util.RemDbInfo;
 import org.onap.portalsdk.analytics.util.Utils;
 import org.onap.portalsdk.analytics.xmlobj.FormFieldType;
 import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate;
 import org.onap.portalsdk.core.util.SecurityCodecUtil;
 import org.owasp.esapi.ESAPI;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
 
+@Component
 public class ReportSchedule extends RaptorObject implements Serializable{
 	
 	/**
@@ -87,6 +91,14 @@ public class ReportSchedule extends RaptorObject implements Serializable{
 
 	private static transient final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ReportSchedule.class);
 	
+	private static RemDbInfo remDbInfo;
+	
+	@SuppressWarnings("static-access")
+	@Autowired
+    public void setRemDbInfo(RemDbInfo remDbInfo) {
+		this.remDbInfo = remDbInfo;
+	}
+
 	private String reportID = null;
 
 	private String scheduleUserID = null;
@@ -135,6 +147,10 @@ public class ReportSchedule extends RaptorObject implements Serializable{
 
 	private Vector emailToRoles = new Vector();
 
+	public ReportSchedule() {
+		super();
+	}	
+
 	public ReportSchedule(String reportID, String scheduleUserID, boolean loadData, HttpServletRequest request) {
 		super();
 
@@ -539,7 +555,6 @@ public class ReportSchedule extends RaptorObject implements Serializable{
         int posAnd = 0;
  		if (!isNull(dbInfo) && (!dbInfo.equals(AppConstants.DB_LOCAL))) {
  			try {
- 			 org.onap.portalsdk.analytics.util.RemDbInfo remDbInfo = new org.onap.portalsdk.analytics.util.RemDbInfo();
  			 dbType = remDbInfo.getDBType(dbInfo);	
  			} catch (Exception ex) {
  		           throw new RaptorException(ex);		    	
@@ -1321,7 +1336,7 @@ public class ReportSchedule extends RaptorObject implements Serializable{
 			stmt = connection.prepareStatement(sql);
 			stmt.setString(1,scheduleId);
 			rs = stmt.executeQuery();
-			//Writer out = null;
+			Writer out = null;
             /*if(Globals.isWeblogicServer()) {
             	java.sql.Clob clob = null;
             	if (rs.next())