diff options
author | mravula <mr257h@att.com> | 2019-12-16 15:37:23 -0500 |
---|---|---|
committer | mravula <mr257h@att.com> | 2020-01-14 10:02:31 -0500 |
commit | 28af72fc23a1e0cb67e1ac1b5fac6b6d9020270a (patch) | |
tree | 490dc3652bccb7e8752ed8a761fcc6950acb91fe /ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition | |
parent | b51640fc222a61869c26c9fc9a5fe5034f6f39b4 (diff) |
Resolved null-pointer-exception while running raptor test cases
Issue-ID: PORTAL-725
Change-Id: I31b57e200b98e616f32f73e1b6a14682555fca94
Signed-off-by: mravula <mr257h@att.com>
Diffstat (limited to 'ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition')
2 files changed, 118 insertions, 0 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java index 483505af..9e9428cf 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/DefinitionJSON.java @@ -39,6 +39,8 @@ package org.onap.portalsdk.analytics.model.definition.wizard; import java.util.List; +import org.onap.portalsdk.analytics.xmlobj.DashboardReports; + public class DefinitionJSON implements WizardJSON { private String tabName; @@ -48,6 +50,7 @@ public class DefinitionJSON implements WizardJSON { private String reportName; private String reportDescr; private String reportType; + private List<IdNameBooleanJSON> reportTypeList = null; private String dbInfo; private String formHelpText; private Integer pageSize; @@ -74,6 +77,10 @@ public class DefinitionJSON implements WizardJSON { private String allowScheduler; private String sizedByContent; private String repDefType; + private String dashboardLayoutHTML; + private String dashboardLayoutJSON; + private DashboardReports dashboardReports; + @Override public String getTabName() { return tabName; @@ -127,6 +134,14 @@ public class DefinitionJSON implements WizardJSON { public void setReportType(String reportType) { this.reportType = reportType; } + + public void setReportTypeList(List<IdNameBooleanJSON> reportTypeList) { + this.reportTypeList = reportTypeList; + } + + public List<IdNameBooleanJSON> getReportTypeList() { + return reportTypeList; + } public String getDbInfo() { return dbInfo; @@ -335,4 +350,29 @@ public class DefinitionJSON implements WizardJSON { public void setDbInfoList(List<IdNameBooleanJSON> dbInfoList) { this.dbInfoList = dbInfoList; } + + public String getDashboardLayoutHTML() { + return dashboardLayoutHTML; + } + + public void setDashboardLayoutHTML(String dashboardLayoutHTML) { + this.dashboardLayoutHTML = dashboardLayoutHTML; + } + + public String getDashboardLayoutJSON() { + return dashboardLayoutJSON; + } + + public void setDashboardLayoutJSON(String dashboardLayoutJSON) { + this.dashboardLayoutJSON = dashboardLayoutJSON; + } + + public DashboardReports getDashboardReports() { + return dashboardReports; + } + + public void setDashboardReports(DashboardReports dashboardReports) { + this.dashboardReports = dashboardReports; + } + } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/FormFieldGroupsJSON.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/FormFieldGroupsJSON.java new file mode 100644 index 00000000..fa4f8dda --- /dev/null +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/definition/wizard/FormFieldGroupsJSON.java @@ -0,0 +1,78 @@ +/* + * ============LICENSE_START========================================== + * ONAP Portal SDK + * =================================================================== + * Copyright © 2017 AT&T Intellectual Property. All rights reserved. + * =================================================================== + * + * Unless otherwise specified, all software contained herein is licensed + * under the Apache License, Version 2.0 (the "License"); + * you may not use this software except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Unless otherwise specified, all documentation contained herein is licensed + * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); + * you may not use this documentation except in compliance with the License. + * You may obtain a copy of the License at + * + * https://creativecommons.org/licenses/by/4.0/ + * + * Unless required by applicable law or agreed to in writing, documentation + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * ============LICENSE_END============================================ + * + * + */ +package org.onap.portalsdk.analytics.model.definition.wizard; + +public class FormFieldGroupsJSON { + + private String reportId; + private String formFieldGroupsJSON; + private String message; + private String errorMessage; + private String errorStackTrace; + + public String getReportId() { + return reportId; + } + public void setReportId(String reportId) { + this.reportId = reportId; + } + public String getFormFieldGroupsJSON() { + return formFieldGroupsJSON; + } + public void setFormFieldGroupsJSON(String formFieldGroupsJSON) { + this.formFieldGroupsJSON = formFieldGroupsJSON; + } + public String getMessage() { + return message; + } + public void setMessage(String message) { + this.message = message; + } + public String getErrorMessage() { + return errorMessage; + } + public void setErrorMessage(String errorMessage) { + this.errorMessage = errorMessage; + } + public String getErrorStackTrace() { + return errorStackTrace; + } + public void setErrorStackTrace(String errorStackTrace) { + this.errorStackTrace = errorStackTrace; + } +} |