From 8b514a087e96594dc982a95a866d654faccd6e0a Mon Sep 17 00:00:00 2001 From: "Kotta, Shireesha (sk434m)" Date: Tue, 13 Mar 2018 12:36:39 -0400 Subject: Added Junits Issue-ID: PORTAL-136 Includes JUNITS Change-Id: Ie278f9d362e6c9fba0ecdb4a493d8f88a2768fc0 Signed-off-by: Kotta, Shireesha (sk434m) --- .../analytics/util/upgrade/SystemUpgrade.java | 124 ++++++++++----------- 1 file changed, 62 insertions(+), 62 deletions(-) (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util') diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/upgrade/SystemUpgrade.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/upgrade/SystemUpgrade.java index 9c2255b4..9a427003 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/upgrade/SystemUpgrade.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/upgrade/SystemUpgrade.java @@ -77,67 +77,67 @@ public class SystemUpgrade extends org.onap.portalsdk.analytics.RaptorObject { }*/ } // upgradeDB - private static void upgrateFromV1ToV2_0(HttpServletRequest request) throws Exception { - StringBuffer log = new StringBuffer(); - log.append("Starting upgrade...
\n"); - - DataSet ds = DbUtils.executeQuery("SELECT cr.rep_id, cr.sched_mailto_user_ids FROM cr_report cr"); - for(int i=0; iProcessing report ["+repId+"]: "); - - Connection connection = DbUtils.startTransaction(); - String emailIds = nvls(ds.getString(i, 1)); - if(emailIds.length()>0) - try { - log.append("Converting emails "); - StringTokenizer st = new StringTokenizer(emailIds, ","); - while(st.hasMoreTokens()) { - String userId = nvls(st.nextToken()); - log.append(userId); - if(userId.length()>0) - DbUtils.executeUpdate(connection, "INSERT INTO cr_report_schedule_users (rep_id, user_id) VALUES ("+repId+", "+userId+")"); - log.append("-success, "); - } // while - log.append(" COMPLETED; "); - } catch(Exception e) { - log.append("-FAILED; "); - } - - String reportXML = ReportLoader.loadCustomReportXML(repId); - ReportDefinition rdef = ReportDefinition.unmarshal(reportXML, repId, request); - ReportWrapper rw = new ReportWrapper(rdef.cloneCustomReport(), repId, null, null, null, null, null, null, false); - - for(Iterator iter=rw.getAllColumns().iterator(); iter.hasNext(); ) { - DataColumnType col = (DataColumnType) iter.next(); - String drillDownURL = nvls(col.getDrillDownURL()); - if(drillDownURL.startsWith("dispatcher?action=custrep.run&c_master=")) { - drillDownURL = AppUtils.getReportExecuteActionURL()+drillDownURL.substring("dispatcher?action=custrep.run&c_master=".length()); - log.append("Drill-down processed; "); - col.setDrillDownURL(drillDownURL); - } - } // for - - reportXML = rw.marshal(); - - /*PrintWriter xmlOut = new PrintWriter(new BufferedWriter(new FileWriter(new File(AppUtils.getTempFolderPath()+AppUtils.getUserID(request))))); - xmlOut.println(reportXML); - xmlOut.close();*/ - - try { - ReportLoader.updateCustomReportRec(connection, rw, reportXML); - DbUtils.commitTransaction(connection); - log.append("REPORT UPDATED\n"); - } catch(Exception e) { - log.append("REPORT UPDATE FAILED\n"); - DbUtils.rollbackTransaction(connection); - } finally { - DbUtils.clearConnection(connection); - } - } // for - - log.append("
\nSystem upgrade successfully completed...
\n"); - request.setAttribute("system_message", log.toString()); - } // upgrateFromV1ToV2_0 +// private static void upgrateFromV1ToV2_0(HttpServletRequest request) throws Exception { +// StringBuffer log = new StringBuffer(); +// log.append("Starting upgrade...
\n"); +// +// DataSet ds = DbUtils.executeQuery("SELECT cr.rep_id, cr.sched_mailto_user_ids FROM cr_report cr"); +// for(int i=0; iProcessing report ["+repId+"]: "); +// +// Connection connection = DbUtils.startTransaction(); +// String emailIds = nvls(ds.getString(i, 1)); +// if(emailIds.length()>0) +// try { +// log.append("Converting emails "); +// StringTokenizer st = new StringTokenizer(emailIds, ","); +// while(st.hasMoreTokens()) { +// String userId = nvls(st.nextToken()); +// log.append(userId); +// if(userId.length()>0) +// DbUtils.executeUpdate(connection, "INSERT INTO cr_report_schedule_users (rep_id, user_id) VALUES ("+repId+", "+userId+")"); +// log.append("-success, "); +// } // while +// log.append(" COMPLETED; "); +// } catch(Exception e) { +// log.append("-FAILED; "); +// } +// +// String reportXML = ReportLoader.loadCustomReportXML(repId); +// ReportDefinition rdef = ReportDefinition.unmarshal(reportXML, repId, request); +// ReportWrapper rw = new ReportWrapper(rdef.cloneCustomReport(), repId, null, null, null, null, null, null, false); +// +// for(Iterator iter=rw.getAllColumns().iterator(); iter.hasNext(); ) { +// DataColumnType col = (DataColumnType) iter.next(); +// String drillDownURL = nvls(col.getDrillDownURL()); +// if(drillDownURL.startsWith("dispatcher?action=custrep.run&c_master=")) { +// drillDownURL = AppUtils.getReportExecuteActionURL()+drillDownURL.substring("dispatcher?action=custrep.run&c_master=".length()); +// log.append("Drill-down processed; "); +// col.setDrillDownURL(drillDownURL); +// } +// } // for +// +// reportXML = rw.marshal(); +// +// /*PrintWriter xmlOut = new PrintWriter(new BufferedWriter(new FileWriter(new File(AppUtils.getTempFolderPath()+AppUtils.getUserID(request))))); +// xmlOut.println(reportXML); +// xmlOut.close();*/ +// +// try { +// ReportLoader.updateCustomReportRec(connection, rw, reportXML); +// DbUtils.commitTransaction(connection); +// log.append("REPORT UPDATED\n"); +// } catch(Exception e) { +// log.append("REPORT UPDATE FAILED\n"); +// DbUtils.rollbackTransaction(connection); +// } finally { +// DbUtils.clearConnection(connection); +// } +// } // for +// +// log.append("
\nSystem upgrade successfully completed...
\n"); +// request.setAttribute("system_message", log.toString()); +// } // upgrateFromV1ToV2_0 } // SystemUpgrade -- cgit 1.2.3-korg