From a932df953215fa4fe25d0dee962291eaa64d1846 Mon Sep 17 00:00:00 2001 From: "Lo, WEI-TING(wl849v)" Date: Mon, 19 Mar 2018 17:37:22 -0400 Subject: Effort to make portal resilient Issue-ID: PORTAL-210 Includes music library that contatins session management Change-Id: Icacab904e1f948068348fcc19cd77965cb5b446e Signed-off-by: Lo, WEI-TING(wl849v) --- .../portalsdk/analytics/model/definition/ReportDefinition.java | 2 +- .../portalsdk/analytics/model/definition/ReportSchedule.java | 10 ++++++++-- .../org/onap/portalsdk/analytics/model/runtime/FormField.java | 2 +- .../onap/portalsdk/analytics/model/runtime/VisualManager.java | 8 +++++++- .../system/fusion/controller/FileServletController.java | 2 +- .../java/org/onap/portalsdk/analytics/view/ColumnHeader.java | 9 ++++++++- .../java/org/onap/portalsdk/analytics/view/ColumnVisual.java | 9 ++++++++- .../main/java/org/onap/portalsdk/analytics/view/DataRow.java | 7 ++++++- .../main/java/org/onap/portalsdk/analytics/view/DataValue.java | 9 ++++++++- 9 files changed, 48 insertions(+), 10 deletions(-) (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org') 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 0f7ffac9..0b8f1121 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 @@ -113,7 +113,7 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; public class ReportDefinition extends ReportWrapper implements Serializable { - private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ReportDefinition.class); + private static transient final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ReportDefinition.class); private ReportSchedule reportSchedule = null; 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 f4b54a18..5ffb1326 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 @@ -40,6 +40,7 @@ package org.onap.portalsdk.analytics.model.definition; import java.io.IOException; import java.io.InputStreamReader; import java.io.Reader; +import java.io.Serializable; import java.io.Writer; import java.sql.Connection; import java.sql.PreparedStatement; @@ -77,9 +78,14 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; import org.onap.portalsdk.core.util.SecurityCodecUtil; import org.owasp.esapi.ESAPI; -public class ReportSchedule extends RaptorObject { +public class ReportSchedule extends RaptorObject implements Serializable{ - private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ReportSchedule.class); + /** + * + */ + private static final long serialVersionUID = 6936844475227328201L; + + private static transient final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(ReportSchedule.class); private String reportID = null; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java index 7da22187..de8df881 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/FormField.java @@ -89,7 +89,7 @@ import org.onap.portalsdk.core.logging.logic.EELFLoggerDelegate; public class FormField extends org.onap.portalsdk.analytics.RaptorObject implements Serializable { - private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FormField.class); + private static transient final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FormField.class); private static final String HTML_FORM = "formd"; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/VisualManager.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/VisualManager.java index 7036b254..ee0b2b4e 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/VisualManager.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/runtime/VisualManager.java @@ -37,12 +37,18 @@ */ package org.onap.portalsdk.analytics.model.runtime; +import java.io.Serializable; import java.util.HashMap; import org.onap.portalsdk.analytics.RaptorObject; import org.onap.portalsdk.analytics.util.AppConstants; -public class VisualManager extends RaptorObject { +public class VisualManager extends RaptorObject implements Serializable{ + /** + * + */ + private static final long serialVersionUID = -5503994112113552952L; + private HashMap hiddenCols = new HashMap(); private String sortByColId = ""; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/controller/FileServletController.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/controller/FileServletController.java index b6c985a5..94ee29fd 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/controller/FileServletController.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/controller/FileServletController.java @@ -64,7 +64,7 @@ import org.springframework.web.servlet.ModelAndView;; public class FileServletController { - private static final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FileServletController.class); + private static transient final EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FileServletController.class); private DataAccessService dataAccessService; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnHeader.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnHeader.java index 0abd35ca..4a140d15 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnHeader.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnHeader.java @@ -37,7 +37,14 @@ */ package org.onap.portalsdk.analytics.view; -public class ColumnHeader extends org.onap.portalsdk.analytics.RaptorObject { +import java.io.Serializable; + +public class ColumnHeader extends org.onap.portalsdk.analytics.RaptorObject implements Serializable{ + /** + * + */ + private static final long serialVersionUID = -5667833660934169723L; + private String columnTitle = ""; private String columnWidth = ""; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnVisual.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnVisual.java index 9ce62ef4..f6623bb1 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnVisual.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/ColumnVisual.java @@ -37,9 +37,16 @@ */ package org.onap.portalsdk.analytics.view; +import java.io.Serializable; + import org.onap.portalsdk.analytics.RaptorObject; -public class ColumnVisual extends RaptorObject { +public class ColumnVisual extends RaptorObject implements Serializable { + /** + * + */ + private static final long serialVersionUID = -6102940391623735541L; + private String colId = null; private String colDisplay = null; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/DataRow.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/DataRow.java index cd4a0a76..619df67e 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/DataRow.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/DataRow.java @@ -37,11 +37,16 @@ */ package org.onap.portalsdk.analytics.view; +import java.io.Serializable; import java.util.ArrayList; import java.util.Vector; -public class DataRow/* extends Vector*/ { +public class DataRow implements Serializable{ + /** + * + */ + private static final long serialVersionUID = 701793162902559746L; private ArrayList dataValueList = new ArrayList(); private HtmlFormatter rowFormatter = null; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/DataValue.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/DataValue.java index e95e2de0..c4627ca4 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/DataValue.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/view/DataValue.java @@ -37,7 +37,14 @@ */ package org.onap.portalsdk.analytics.view; -public class DataValue extends org.onap.portalsdk.analytics.RaptorObject { +import java.io.Serializable; + +public class DataValue extends org.onap.portalsdk.analytics.RaptorObject implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1264128118175701859L; + private String displayValue = ""; private String displayCalculatedValue = ""; -- cgit 1.2.3-korg