diff options
author | Sudarshan Kumar <sudarshan.kumar@att.com> | 2020-11-02 16:53:33 +0530 |
---|---|---|
committer | Sudarshan Kumar <sudarshan.kumar@att.com> | 2020-11-02 19:05:40 +0530 |
commit | ad2d7d08693ccb514d51e15505541bc55051a871 (patch) | |
tree | 87dcd4071328ae845d84f47c5fec08f34f8e43a2 /ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model | |
parent | 3e850031660af8c78ecbd0bf801e3ceb26f040a1 (diff) |
Portal-Raptor Fixes
Portal-Raptor Fixes - Not able to save report SQL Tab Info
Issue-ID: PORTAL-1036
Change-Id: Ic55b1ec35782d54a27186e8f2d9e17d809413d8c
Signed-off-by: Sudarshan Kumar <sudarshan.kumar@att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model')
2 files changed, 16 insertions, 1 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportSecurity.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportSecurity.java index 5da6c563..8104acdc 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportSecurity.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/ReportSecurity.java @@ -37,6 +37,7 @@ */ package org.onap.portalsdk.analytics.model.base; +import java.io.Serializable; import java.util.Hashtable; import java.util.Iterator; import java.util.Vector; @@ -55,7 +56,12 @@ import org.onap.portalsdk.analytics.util.DataSet; import org.onap.portalsdk.analytics.util.Utils; import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; -public class ReportSecurity extends org.onap.portalsdk.analytics.RaptorObject { +public class ReportSecurity extends org.onap.portalsdk.analytics.RaptorObject implements Serializable{ + + /** + * + */ + private static final long serialVersionUID = 1L; private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ReportSecurity.class); diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportDefinition.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportDefinition.java index 8b1cc8cb..343862b6 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportDefinition.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/ReportDefinition.java @@ -274,6 +274,7 @@ public class ReportDefinition extends ReportWrapper implements Serializable { } // canPersistCrossTabReport private boolean canPersistReport() { + String reportType = getReportType(); return getReportType().equals(AppConstants.RT_CROSSTAB) ? canPersistCrossTabReport() : (getReportType().equals(AppConstants.RT_LINEAR)? canPersistLinearReport() :(getReportType().equals(AppConstants.RT_HIVE)? canPersistLinearReport() @@ -307,6 +308,14 @@ public class ReportDefinition extends ReportWrapper implements Serializable { } DataSet ds = DbUtils.executeQuery(connection,sql); setReportID(ds.getString(0, 0)); + + //Start - Added new code + ReportDefinition rdef = (ReportDefinition) request.getSession().getAttribute(AppConstants.SI_REPORT_DEFINITION); + if(rdef != null) { + rdef.setReportID(ds.getString(0, 0)); + } + request.getSession().setAttribute(AppConstants.SI_REPORT_DEFINITION, rdef); + //End - Added new code reportSecurity.reportCreate(reportID, userID, isPublic()); ReportLoader.createCustomReportRec(connection, this, reportXML); |