summaryrefslogtreecommitdiffstats
path: root/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion
diff options
context:
space:
mode:
Diffstat (limited to 'ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion')
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/AntBuild.java66
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/AppUtils.java363
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/DbUtils.java75
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/RemoteDbUtils.java50
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/AdapterSessionFactoryContainer.java39
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/DateUtils.java287
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/FusionAdapter.java135
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/IdName.java59
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/Item.java55
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/Lookup.java85
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/RaptorAdapter.java368
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/SpringContext.java37
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/controller/FileServletController.java206
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/CR_Report.java306
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/QuickLink.java61
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/RaptorSearch.java188
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/ReportInfo.java159
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/service/RaptorService.java36
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/service/RaptorServiceImpl.java163
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/RaptorController.java191
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java410
-rw-r--r--ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/ReportsSearchListController.java74
22 files changed, 0 insertions, 3413 deletions
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/AntBuild.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/AntBuild.java
deleted file mode 100644
index 724a07d3..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/AntBuild.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion;
-
-import java.io.IOException;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.jar.Attributes;
-import java.util.jar.JarFile;
-import java.util.jar.Manifest;
-
-/**
- * This class is used to get version and Build information when
- * user run "java -jar raptor_fusion.jar" command.
- */
-public class AntBuild {
-
- public static void main(String[] args) {
- System.out.println("Jar (raptor_fusion.jar) Information: ");
- readManifest();
- }
-
- public static void readManifest() {
- try {
- JarFile jar = new JarFile("./raptor_fusion.jar");
- Manifest manifest = jar.getManifest();
-
- Attributes attribs = manifest.getMainAttributes();
- Iterator it = attribs.entrySet().iterator();
- while(it.hasNext()) {
- Map.Entry entry = (Map.Entry) it.next();
- Attributes.Name attributeName = (Attributes.Name) entry.getKey();
- String attributeValue = (String) entry.getValue();
- if (attributeName.toString().equals("Created-By"))
- System.out.println("JDK Version " + " : " + attributeValue);
- else if (attributeName.toString().equals("Ant-Version"))
- System.out.println(attributeName.toString() + " : " + attributeValue);
- else {
- if(attributeName.toString().startsWith("Raptor"))
- System.out.println(attributeName.toString() + " : " + attributeValue);
- }
- }
-
- } catch (IOException e) {
- System.err.println("Cannot read jar-file manifest: "
- + e.getMessage());
- }
- }
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/AppUtils.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/AppUtils.java
deleted file mode 100644
index 008a1d8c..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/AppUtils.java
+++ /dev/null
@@ -1,363 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion;
-
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Properties;
-import java.util.Set;
-import java.util.StringTokenizer;
-import java.util.Vector;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-
-import org.openecomp.portalsdk.analytics.config.ConfigLoader;
-import org.openecomp.portalsdk.analytics.error.RaptorException;
-import org.openecomp.portalsdk.analytics.model.base.IdNameValue;
-import org.openecomp.portalsdk.analytics.system.Globals;
-import org.openecomp.portalsdk.analytics.system.IAppUtils;
-import org.openecomp.portalsdk.analytics.system.fusion.adapter.RaptorAdapter;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;;
-
-public class AppUtils extends org.openecomp.portalsdk.analytics.RaptorObject implements IAppUtils {
-
- EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(AppUtils.class);
-
-
- private static String tempFolderPath = "/artemis/PROJECT1/MSA/databank/WEB-INF/temp/";
- private static String uploadFolderPath = "/artemis/PROJECT1/MSA/databank/WEB-INF/upload/";
- private static String tempFolderURL = "temp/";
- private static String uploadFolderURL = "upload/";
- private static String SMTPServer = "todo.smtp.server.com";
- private static String defaultEmailSender = "todo.email.sender.com";
- private static String errorPage = "error_page";
- private static String errorPageWMenu = "error_page_wmenu";
- private static String jspContextPath = "raptor/";
- private static String imgFolderURL = "raptor/images/";
- private static String baseFolderURL = "raptor/";
- //private static String reportExecuteActionURL = "dispatcher?action=raptor&r_action=report.run&c_master=";
- //private static String dataViewActionURL = "dispatcher?action="; // dispatcher?action=ACTION_ID&c_master=REC_ID
- //private static String dataViewActionParam = "c_master=";
- private static String directAccessURL = "http://localhost:8082/databank/dispatcher?direct.access=raptor&r_action=report.run&show=";
- private static String baseActionURL = "dispatcher?action="; // dispatcher?action=ACTION_ID&c_master=REC_ID or dispatcher?action=raptor&r_action=RAPTOR_ACTION_ID&c_master=REC_ID
- private static String baseActionURLNG = "report#/"; // dispatcher?action=ACTION_ID&c_master=REC_ID or dispatcher?action=raptor&r_action=RAPTOR_ACTION_ID&c_master=REC_ID
- private static String drillActionURL = "dispatcher?action="; // dispatcher?action=ACTION_ID&c_master=REC_ID or dispatcher?action=raptor&r_action=RAPTOR_ACTION_ID&c_master=REC_ID
- private static String baseActionParam = "c_master=";
- private static String superRoleID = "1";
- private static Vector adminRoleIDs = new Vector();
- private static Vector quickLinksMenuIDs = new Vector();
-
- private static Properties raptorAppProperties;
-
- private static String encryptedSMTPServer = "";
- public AppUtils() {}
-
- public void initializeAppUtils(ServletContext servletContext) {
- try {
- Properties appProperties = ConfigLoader.getProperties(servletContext, ConfigLoader.APP_PROPERTIES, Globals.getSystemType());
- raptorAppProperties = appProperties;
- tempFolderPath = appProperties.getProperty("temp_folder_path");
- uploadFolderPath = appProperties.getProperty("upload_folder_path");
- tempFolderURL = appProperties.getProperty("temp_folder_url");
- uploadFolderURL = appProperties.getProperty("upload_folder_url");
- SMTPServer = appProperties.getProperty("smtp_server");
- encryptedSMTPServer = appProperties.getProperty("encrypted_smtp_server");
- defaultEmailSender = appProperties.getProperty("default_email_sender");
- errorPage = appProperties.getProperty("error_page");
- jspContextPath = appProperties.getProperty("jsp_context_path");
- imgFolderURL = appProperties.getProperty("img_folder_url");
- baseFolderURL = appProperties.getProperty("base_folder_url");
-/* reportExecuteActionURL = appProperties.getProperty("report_execute_action_url");
- dataViewActionURL = appProperties.getProperty("data_view_action_url");
- dataViewActionParam = appProperties.getProperty("data_view_action_param");*/
- directAccessURL = appProperties.getProperty("direct_access_url");
- baseActionURL = appProperties.getProperty("base_action_url");
- baseActionURLNG = appProperties.getProperty("base_action_url_ng");
- drillActionURL = appProperties.getProperty("drill_action_url");
- baseActionParam = appProperties.getProperty("base_action_param");
- superRoleID = appProperties.getProperty("super_role_id");
-
- adminRoleIDs.removeAllElements();
- StringTokenizer st = new StringTokenizer(appProperties.getProperty("admin_role_ids"), ",");
- while(st.hasMoreTokens())
- adminRoleIDs.add(st.nextToken());
-
- quickLinksMenuIDs.removeAllElements();
- st = new StringTokenizer(appProperties.getProperty("quick_links_menu_ids"), ",");
- while(st.hasMoreTokens())
- quickLinksMenuIDs.add(st.nextToken());
- } catch(Exception e) {
- logger.error(EELFLoggerDelegate.debugLogger, ("[EXCEPTION ENCOUNTERED IN RAPTOR] AppUtils.initializeAppUtils: Unable to load properties ["+Globals.getSystemType()+"_"+ConfigLoader.APP_PROPERTIES+"]. Exception: "+e.getMessage()));
- //throw new RuntimeException(e.getMessage());
- }
- } // initializeAppUtils
-
- public static void getFullURL(HttpServletRequest req) {
- String applicationBase = "";
- if (applicationBase == null) {
- applicationBase = req.getScheme() + "://" + req.getServerName() +
- getPort(req) + req.getContextPath();
- }
- }
-
- private static String getPort(HttpServletRequest req) {
- if ("http".equalsIgnoreCase(req.getScheme()) && req.getServerPort() != 80 ||
- "https".equalsIgnoreCase(req.getScheme()) && req.getServerPort() != 443 ) {
- return (":" + req.getServerPort());
- } else {
- return "";
- }
- }
- public String getUserID(HttpServletRequest request) {
- String pdfAttachmentKey = org.openecomp.portalsdk.analytics.system.AppUtils.getRequestValue(request, "pdfAttachmentKey");
- String report_email_sent_log_id = org.openecomp.portalsdk.analytics.system.AppUtils.getRequestValue(request, "log_id");
- boolean isEmailAttachment = false;
- if(pdfAttachmentKey != null && report_email_sent_log_id !=null)
- isEmailAttachment = true;
- if(isEmailAttachment) {
- return RaptorAdapter.getUserID(org.openecomp.portalsdk.analytics.system.AppUtils.getRequestValue(request, "user_id"));
- } else
- return RaptorAdapter.getUserID(request);
- } // getUserID
-
- public Vector getAllUsers(String customizedQuery, String param, boolean isAdmin) {
- Map map = RaptorAdapter.getAllUsers(customizedQuery, param, isAdmin);
-
- Vector vector = new Vector(map.size());
- for(Iterator iter=map.keySet().iterator(); iter.hasNext(); ) {
- Long key = (Long) iter.next();
- vector.add(new IdNameValue(""+key, (String) map.get(key)));
- } // for
-
- return vector;
- } // getAllUsers
-
- public String getRoleName(String roleId) {
- return RaptorAdapter.getRoleName(roleId);
- } // getRoleName
-
- public Vector getAllRoles(String customizedQuery, String param, boolean isAdmin) {
- Map map = RaptorAdapter.getAllRolesUsingCustomizedQuery(customizedQuery, param, isAdmin);
-
- Vector vector = new Vector(map.size());
- for(Iterator iter=map.keySet().iterator(); iter.hasNext(); ) {
- Long key = (Long) iter.next();
- vector.add(new IdNameValue(""+key, (String) map.get(key)));
- } // for
-
- return vector;
- } // getAllRoles
-
- public String getUserName(HttpServletRequest request) {
- return RaptorAdapter.getUserName(request);
- } // getUserName
-
- public String getUserName(String userId) {
- return RaptorAdapter.getUserName(userId);
- } // getUserName
-
- public String getUserEmail(String userId) {
- return RaptorAdapter.getUserEmail(userId);
- } // getUserEmail
-
- public String getUserEmail(HttpServletRequest request) {
- return RaptorAdapter.getUserEmail(request);
- } // getUserEmail
-
- public String getUserLoginId(HttpServletRequest request) {
- return RaptorAdapter.getUserLoginId(request);
- } // getUserLoginId
-
- public String getUserLoginId(String userId) {
- return RaptorAdapter.getUserLoginId(userId);
- } // getUserLoginId
-
- public String getUserBackdoorLoginId(HttpServletRequest request) {
- String pdfAttachmentKey = org.openecomp.portalsdk.analytics.system.AppUtils.getRequestValue(request, "pdfAttachmentKey");
- String report_email_sent_log_id = org.openecomp.portalsdk.analytics.system.AppUtils.getRequestValue(request, "log_id");
- boolean isEmailAttachment = false;
- if(pdfAttachmentKey != null && report_email_sent_log_id !=null)
- isEmailAttachment = true;
- if(isEmailAttachment) {
- return RaptorAdapter.getUserBackdoorLoginId(org.openecomp.portalsdk.analytics.system.AppUtils.getRequestValue(request, "user_id"));
- } else
- return RaptorAdapter.getUserBackdoorLoginId(request);
- } // getUserBackdoorLoginId
-
- public boolean isUserInRole(HttpServletRequest request, String roleId) {
- return RaptorAdapter.isCurrentUserInRole(request, roleId);
- } // isUserInRole
-
- public Vector getUserRoles(HttpServletRequest request) {
-// Map map = RaptorAdapter.getAllRoles(userId);
- Set set = RaptorAdapter.getUserRoles(request);
-
- Vector vector = new Vector(set.size());
- for(Iterator iter=set.iterator(); iter.hasNext(); ) {
- Long key = (Long) iter.next();
- vector.add(""+key);
- //vector.add(new IdNameValue(""+key, (String) map.get(key)));
- } // for
-
- return vector;
- } // getUserRoles
-
- public Vector getUserRoles(String userId) {
- Set set = RaptorAdapter.getUserRoles(userId);
-
- Vector vector = new Vector(set.size());
- for(Iterator iter=set.iterator(); iter.hasNext(); ) {
- Long key = (Long) iter.next();
- vector.add(""+key);
- //vector.add(new IdNameValue(""+key, (String) map.get(key)));
- } // for
-
- return vector;
- //return null;
- } // getUserRoles
-
- public void resetUserCache() {
- //org.openecomp.portalsdk.core.web.support.AppUtils.removeObjectFromCache(RaptorAdapter.KEY_USER_ROLES_CACHE);
- } // resetUserCache
-
- public String getSuperRoleID(){
- return superRoleID;
- } // getSuperRoleID
-
- public Vector getAdminRoleIDs(){
- return adminRoleIDs;
- } // getAdminRoleIDs
-
-
- public String getTempFolderPath() {
- return tempFolderPath;
- } // getTempFolderPath
-
- public String getUploadFolderPath() {
- return uploadFolderPath;
- } // getUploadFolderPath
-
- public String getTempFolderURL() {
- return tempFolderURL;
- } // getTempFolderURL
-
- public String getUploadFolderURL() {
- return uploadFolderURL;
- } // getUploadFolderURL
-
- public String getSMTPServer() {
- return SMTPServer;
- } // getSMTPServer
-
- public String getDefaultEmailSender() {
- return defaultEmailSender;
- } // getDefaultEmailSender
-
- public String getErrorPage() {
- return errorPage;
- } // getErrorPage
-
- public String getJspContextPath() {
- return jspContextPath;
- } // getJspContextPath
-
- public String getImgFolderURL() {
- return imgFolderURL;
- } // getImgFolderURL
-
- public String getBaseFolderURL() {
- return baseFolderURL;
- } // getBaseFolderURL
-
-/* public String getReportExecuteActionURL() {
- return reportExecuteActionURL;
- } // getReportExecuteActionURL
-
- public String getDataViewActionURL() {
- return dataViewActionURL;
- } // getDataViewActionURL
-
- public String getDataViewActionParam() {
- return dataViewActionParam;
- } // getDataViewActionParam
-*/
- public String getDirectAccessURL() {
- return directAccessURL.trim();
- } // getDirectAccessURL
-
- public String getBaseActionURL() {
- return baseActionURL;
- } // getBaseActionURL
-
- public String getBaseActionURLNG() {
- return baseActionURLNG;
- } // getBaseActionURLNG
-
- public String getDrillActionURL() {
- return drillActionURL;
- } // getBaseActionURL
-
- public String getBaseActionParam() {
- return baseActionParam;
- } // getBaseActionParam
-
- public Vector getQuickLinksMenuIDs(){
- return quickLinksMenuIDs;
- } // getQuickLinksMenuIDs
-
- public String getMenuLabel(String menuId) {
- //return menuId.substring(0, 1).toUpperCase()+menuId.substring(1).toLowerCase();
- return menuId;
- } // getMenuLabel
-
- public String getReportDbColsMaskSQL() {
- return null;
-/* Example:
- return "SELECT f.table_name, UPPER(f.column_name) column_name, f.label "+
- "FROM fields f WHERE f.active_yn = 'Y'"; */
- } // getReportDbColsMaskSQL
-
- public String getReportDbLookupsSQL() {
- return null;
-/* Example:
- return "SELECT DISTINCT f.table_name, UPPER(f.column_name) column_name, f.lookup_table, f.lookup_id_field, f.lookup_name_field "+
- "FROM fields f WHERE f.active_yn = 'Y'"; */
- } // getReportDbLookupsSQL
-
- public void processErrorNotification(HttpServletRequest request, RaptorException e) {
- //RaptorAdapter.processErrorNotification(request, e);
-} // processErrorNotification
-
- public String getErrorPageWMenu() {
- return errorPageWMenu;
- }
-
- public String getExcelTemplatePath() {
- return nvls(raptorAppProperties.getProperty("excel_template_path"), "");
- }
- /**
- * @return the encryptedSMTPServer
- */
- public String getEncryptedSMTPServer() {
- return encryptedSMTPServer;
- }
-
-} // AppUtils
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/DbUtils.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/DbUtils.java
deleted file mode 100644
index 4638f3e3..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/DbUtils.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion;
-
-import java.sql.Connection;
-
-import javax.servlet.ServletContext;
-
-import org.openecomp.portalsdk.analytics.system.IDbUtils;
-import org.openecomp.portalsdk.analytics.system.fusion.adapter.FusionAdapter;
-import org.openecomp.portalsdk.analytics.system.fusion.adapter.RaptorAdapter;
-import org.openecomp.portalsdk.analytics.system.fusion.adapter.SpringContext;
-import org.springframework.beans.factory.annotation.Autowired;
-
-
-
-public class DbUtils implements IDbUtils {
-
- @Autowired
- public RaptorAdapter raptorAdapter;
- @Autowired
- public FusionAdapter fusionAdapter;
-
- public DbUtils() {}
-
- public void initializeDbUtils(ServletContext servletContext) {
- raptorAdapter = (RaptorAdapter)SpringContext.getApplicationContext().getBean("raptorAdapter");
- } // initializeDbUtils
-
- public Connection getConnection() {
- return raptorAdapter.getConnection();
- } // getConnection
-
- public void clearConnection(Connection con) {
- raptorAdapter.releaseConnection(con);
- } // clearConnection
-
- public RaptorAdapter getRaptorAdapter() {
- return raptorAdapter;
- }
-
- public void setRaptorAdapter(RaptorAdapter raptorAdapter) {
- this.raptorAdapter = raptorAdapter;
- }
-
- public FusionAdapter getFusionAdapter() {
- return fusionAdapter;
- }
-
- public void setFusionAdapter(FusionAdapter fusionAdapter) {
- this.fusionAdapter = fusionAdapter;
- }
-
-
-
-
-
-} // DbUtils
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/RemoteDbUtils.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/RemoteDbUtils.java
deleted file mode 100644
index 4f8f7427..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/RemoteDbUtils.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion;
-
-import java.sql.Connection;
-
-import javax.servlet.ServletContext;
-
-import org.openecomp.portalsdk.analytics.system.RDbUtils;
-import org.openecomp.portalsdk.analytics.system.fusion.adapter.RaptorAdapter;
-import org.openecomp.portalsdk.analytics.system.fusion.adapter.SpringContext;
-
-
-
-public class RemoteDbUtils implements RDbUtils{
-
- private RaptorAdapter raptorAdapter;
-
-
- public void initializeDbUtils(ServletContext servletContext) {
- raptorAdapter = (RaptorAdapter)SpringContext.getApplicationContext().getBean("raptorAdapter");
- } // initializeDbUtils
-
-
- public Connection getRemoteConnection(String dbKey) {
- return raptorAdapter.getConnection(dbKey);
- }
-
- public void clearConnection(Connection conn) {
- raptorAdapter.releaseConnection(conn);
- }
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/AdapterSessionFactoryContainer.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/AdapterSessionFactoryContainer.java
deleted file mode 100644
index 1e2de464..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/AdapterSessionFactoryContainer.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.adapter;
-
-import java.util.LinkedHashMap;
-
-public class AdapterSessionFactoryContainer {
-
- private LinkedHashMap sessionFactories;
-
- public AdapterSessionFactoryContainer() {
- }
-
- public LinkedHashMap getSessionFactories() {
- return sessionFactories;
- }
-
- public void setSessionFactories(LinkedHashMap sessionFactories) {
- this.sessionFactories = sessionFactories;
- }
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/DateUtils.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/DateUtils.java
deleted file mode 100644
index a9ea0979..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/DateUtils.java
+++ /dev/null
@@ -1,287 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.adapter;
-
-
-import java.io.Serializable;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.List;
-import java.util.TimeZone;
-
-import org.openecomp.portalsdk.core.FusionObject;
-import org.openecomp.portalsdk.core.domain.User;
-import org.openecomp.portalsdk.core.service.DataAccessService;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.openecomp.portalsdk.core.web.support.AppUtils;
-
-
-public class DateUtils implements Serializable, FusionObject{
-
- public static final String US_PACIFIC = "US/Pacific";
- public static final String US_MOUNTAIN = "US/Mountain";
- public static final String US_CENTRAL = "US/Central";
- public static final String US_EASTERN = "US/Eastern";
- public static final String US_HAWAII = "US/Hawaii";
- public static final String US_ALASKA = "US/Alaska";
-
- //Arizona State has Mountain Time with no Daylight Savings
- public static final String US_ARIZONA = "America/Phoenix";
-
- private static final String DB_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss";
- private static final String GET_CURRENT_DATE = "getCurrentDate";
-
- private static DataAccessService dataAccessService;
-
- public static DataAccessService getDataAccessService() {
- return dataAccessService;
- }
-
- public void setDataAccessService(DataAccessService dataAccessService) {
- this.dataAccessService = dataAccessService;
- }
-
- /**
- * Parses a date value with given pattern,
- * to return a Date Object
- *
- * @param dateValue
- * @param inPattern
- * @return Date Object
- * @throws Exception
- *
- */
- public static Date parseDate(String dateValue,String inPattern) throws Exception{
- return parseDate(dateValue,inPattern,null);
- }
-
- /**
- * Parses a date value with the given pattern for the specific TimeZone,
- * to return a Date Object
- *
- * @param dateValue
- * @param inPattern
- * @param currentTimeZone
- * @return Date Object
- * @throws Exception
- *
- */
- public static Date parseDate(String dateValue,String inPattern,
- String currentTimeZone) throws Exception{
- DateFormat df = new SimpleDateFormat(inPattern);
- if(currentTimeZone !=null && !(currentTimeZone.trim().equals(""))){
- df.setTimeZone(TimeZone.getTimeZone(currentTimeZone));
- }
- Date date = df.parse(dateValue);
- return date;
- }
-
- /**
- * Parses a date value with the given pattern for the specific User(in User TimeZone),
- * to return a Date Object
- *
- * @param dateValue
- * @param inPattern
- * @param userId
- * @return Date Object
- * @throws Exception
- *
- */
- public static Date parseUserDate(String dateValue, String inPattern, Long userId) throws Exception{
- User user = (User)getDataAccessService().getDomainObject(User.class, userId, null);
-
- String userTimeZone = null;
- Long timezoneId = user.getTimeZoneId();
-
- if (timezoneId != null) {
- userTimeZone = AppUtils.getLookupValueByLabel(timezoneId.toString(), "fn_lu_timezone", "timezone_id", "timezone_value");
- }
-
- return parseDate(dateValue,inPattern,userTimeZone);
- }
-
- /**
- * Formats a given date object to the desired pattern
- *
- * @param date
- * @param outPattern
- * @return Formatted date value
- * @throws Exception
- */
- public static String formatDate(Date date,String outPattern)throws Exception{
- return formatDate(date,outPattern,null);
- }
-
- /**
- * Formats a date value with the given pattern into a date value with the desired pattern
- *
- * @param dateValue
- * @param inPattern
- * @param outPattern
- * @return Formatted date value
- * @throws Exception
- *
- */
- public static String formatDate(String dateValue,String inPattern,
- String outPattern) throws Exception{
- return formatDate(dateValue,inPattern,null,outPattern,null);
- }
-
- /**
- * Formats a given date object to the desired pattern for the TimeZone provided
- * @param date
- * @param outPattern
- * @param requiredTimeZone
- * @return Formatted date value
- * @throws Exception
- */
- public static String formatDate(Date date,String outPattern,
- String requiredTimeZone) throws Exception{
- DateFormat df = new SimpleDateFormat(outPattern);
- if(requiredTimeZone != null && !requiredTimeZone.trim().equals("")){
- df.setTimeZone(TimeZone.getTimeZone(requiredTimeZone));
- }
- return df.format(date);
- }
-
- /**
- * Formats a date value with the given pattern
- * into a date value with the desired pattern for the TimeZone provided
- *
- * @param dateValue
- * @param inPattern
- * @param outPattern
- * @param requiredTimeZone
- * @return Formatted date value
- * @throws Exception
- *
- */
- public static String formatDate(String dateValue,String inPattern,
- String outPattern,String requiredTimeZone) throws Exception{
- return formatDate(dateValue,inPattern,null,outPattern,requiredTimeZone);
- }
-
- /**
- * Formats a date value with the given pattern for a specific TimeZone,
- * into a date value with the desired pattern for the TimeZone provided
- *
- * @param dateValue
- * @param inPattern
- * @param currentTimeZone
- * @param outPattern
- * @param requiredTimeZone
- * @return Formatted date value
- * @throws Exception
- *
- */
- public static String formatDate(String dateValue,String inPattern,String currentTimeZone,
- String outPattern,String requiredTimeZone) throws Exception{
- Date date = parseDate(dateValue,inPattern,currentTimeZone);
- return formatDate(date,outPattern,requiredTimeZone);
- }
-
- /**
- * Formats a date value with the given pattern, for a specific User(in User TimeZone),
- * into a date value with the desired pattern for the TimeZone provided
- *
- * @param dateValue
- * @param inPattern
- * @param userId
- * @param outPattern
- * @param requiredTimeZone
- * @return Formatted date value
- * @throws Exception
- *
- */
- public static String formatUserDate(String dateValue,String inPattern, Long userId,String outPattern,String requiredTimeZone) throws Exception{
- User user = (User)getDataAccessService().getDomainObject(User.class, userId, null);
-
- String userTimeZone = null;
- Long timezoneId = user.getTimeZoneId();
-
- if (timezoneId != null) {
- userTimeZone = AppUtils.getLookupValueByLabel(timezoneId.toString(), "fn_lu_timezone", "timezone_id", "timezone_value");
- }
-
- return formatDate(dateValue,inPattern,userTimeZone,outPattern,requiredTimeZone);
- }
-
- /**
- * Formats a date value with a given pattern for a specific User(User TimeZone),
- * into a date value with the desired pattern for Database TimeZone
- *
- * @param dateValue
- * @param inPattern
- * @param userId
- * @param outPattern
- * @return Formatted date value
- * @throws Exception
- *
- */
- public static String formatUserDateForDBTimeZone(String dateValue,String inPattern, Long userId,String outPattern) throws Exception{
- User user = (User)getDataAccessService().getDomainObject(User.class, userId, null);
-
- String userTimeZone = null;
- Long timezoneId = user.getTimeZoneId();
-
- /*if (timezoneId != null) {
- userTimeZone = AppUtils.getLookupValueByLabel(timezoneId.toString(), "fn_lu_timezone", "timezone_id", "timezone_value");
- }*/
-
- String dbTimeZone = SystemProperties.getProperty(SystemProperties.DATABASE_TIME_ZONE);
-
- return formatDate(dateValue,inPattern,userTimeZone,outPattern,dbTimeZone);
- }
-
- /**
- * Get the current database Date/Time
- * @return Date object
- */
- public static Date getCurrentDBDate()throws Exception{
- String dbTimeZone = SystemProperties.getProperty(SystemProperties.DATABASE_TIME_ZONE);
- List results = (List)getDataAccessService().executeNamedQuery(GET_CURRENT_DATE, null, null);
- return parseDate(((Object[])results.get(0))[0]+" "+((Object[])results.get(0))[1],DB_DATE_FORMAT,dbTimeZone);
- }
-
- /**
- * Get the current date value formatted for the User's TimeZone in the desired pattern
- *
- * @param outPattern
- * @param userId
- * @return Date value
- * @throws Exception
- */
- public static String getCurrentDBDateForUser(String outPattern,Long userId)throws Exception{
- User user = (User)getDataAccessService().getDomainObject(User.class, userId, null);
-
- String userTimeZone = null;
- Long timezoneId = user.getTimeZoneId();
-
- /*if (timezoneId != null) {
- userTimeZone = AppUtils.getLookupValueByLabel(timezoneId.toString(), "fn_lu_timezone", "timezone_id", "timezone_value");
- }*/
-
- Date dbDate = getCurrentDBDate();
-
- return formatDate(dbDate,outPattern,userTimeZone);
- }
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/FusionAdapter.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/FusionAdapter.java
deleted file mode 100644
index 33b6ec2d..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/FusionAdapter.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.adapter;
-
-import java.sql.Connection;
-import java.util.Map;
-
-import javax.servlet.ServletContext;
-
-import org.openecomp.portalsdk.core.FusionObject;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.mchange.v2.c3p0.ComboPooledDataSource;
-
-public class FusionAdapter implements FusionObject {
-
- public static final String LOCAL_SESSION_FACTORY_KEY = "local";
-
-
- private ComboPooledDataSource dataSource;
- private Map<String,ComboPooledDataSource> dataSourceMap;
-
- //private SessionFactory sessionFactory;
- private ServletContext servletContext;
-
- // private static Connection connection = null;
-
- //private static AdapterSessionFactoryContainer sessionFactoryContainer;
-
-
- public FusionAdapter() {
- }
-
-
- public ServletContext getServletContext() {
- return servletContext;
- }
-
- public void setServletContext(ServletContext servletContext) {
- this.servletContext = servletContext;
- }
-
- // public static AdapterSessionFactoryContainer getSessionFactoryContainer() {
- // return sessionFactoryContainer;
- // }
-
- //public static LinkedHashMap getSessionFactories() {
- // return getSessionFactoryContainer().getSessionFactories();
- //}
-
-
- //public void setSessionFactoryContainer(AdapterSessionFactoryContainer sessionFactoryContainer) {
- // this.sessionFactoryContainer = sessionFactoryContainer;
- //}
-
-
- /** Gets connection to the database **/
- public Connection getConnection() {
- //Session session = sessionFactory.getCurrentSession();
- Connection connection = null;
- try {
- connection = getDataSource().getConnection();
- } catch(Exception ex) {
- ex.printStackTrace();
- }
-
- return connection;
- }
-
-
- /** Gets connection to the database indicated via the session factory key **/
- public synchronized Connection getConnection(String schemaId) {
- Connection connection = null;
- try {
- connection = getDataSourceMap().get(schemaId).getConnection();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return connection;
- }
-
-
- /** Releases connection to the database **/
- public void releaseConnection(Connection conn) {
- try {
- conn.close();
- //logger.debug("releasing connection from adapter...");
- }
- catch (Exception e) {
- //logger.error("Error while closing the connection.");
- e.printStackTrace();
- }
- }
-
-
- public ComboPooledDataSource getDataSource() {
- return dataSource;
- }
-
-
- @Autowired
- public void setDataSource(ComboPooledDataSource dataSource) {
- this.dataSource = dataSource;
- }
-
- public Map<String,ComboPooledDataSource> getDataSourceMap() {
- if(dataSourceMap==null)
- dataSourceMap = (Map<String,ComboPooledDataSource>)SpringContext.getApplicationContext().getBean("dataSourceMap");
-
- return dataSourceMap;
- }
-
- public void setdataSourceMap(Map<String,ComboPooledDataSource> dataSourceMap) {
- this.dataSourceMap = dataSourceMap;
- }
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/IdName.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/IdName.java
deleted file mode 100644
index 5b4af3f9..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/IdName.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.adapter;
-
-import org.openecomp.portalsdk.core.domain.support.DomainVo;
-
-/**
- * <p>IdName.java</p>
- * <p>Represents a id/name data object.</p>
-*/
-public class IdName extends DomainVo {
-
- private String name;
- private Long id;
-
- public IdName() {}
-
-
- public Long getId() {
- return id;
- }
-
- public void setId(Long id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int compareTo(Object obj){
- String c1 = getName();
- String c2 = ((IdName)obj).getName();
-
- return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2);
- }
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/Item.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/Item.java
deleted file mode 100644
index 71663bc2..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/Item.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.adapter;
-
-
-public class Item {
- private String _id;
- private String _name;
-
- public Item() {
- }
-
- public Item(String id, String name) {
- this._id = id;
- this._name = name;
- }
-
- public String getId() {
- return _id;
- }
-
- public void setId(String id) {
- this._id = id;
- }
-
- public String getName() {
- return _name;
- }
-
- public void setName(String name) {
- this._name = name;
- }
-
- public String toString() {
- return _name;
- }
-}
-
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/Lookup.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/Lookup.java
deleted file mode 100644
index ac6cd16c..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/Lookup.java
+++ /dev/null
@@ -1,85 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.adapter;
-
-
-import java.io.Serializable;
-
-import org.openecomp.portalsdk.core.domain.FusionVo;
-import org.openecomp.portalsdk.core.domain.support.NameValueId;
-
-
-
-public class Lookup extends FusionVo implements Serializable {
-
- private NameValueId nameValueId = new NameValueId();
-
- public Lookup() {}
-
- public Lookup(String label, String value) {
- this();
- setLabel(label);
- setValue(value);
- }
-
- public String getValue() {
- return getNameValueId().getVal();
- }
-
- public String getLabel() {
- return getNameValueId().getLab();
- }
-
- public void setValue(String value) {
- getNameValueId().setVal(value);
- }
-
- public void setLabel(String label) {
- getNameValueId().setLab(label);
- }
-
- public NameValueId getNameValueId() {
- return nameValueId;
- }
-
- public void setNameValueId(NameValueId nameValueId) {
- this.nameValueId = nameValueId;
- }
-
- // required by ZK for to set the selectedItems of Listboxes (used heavily for <select>-style drop-downs)
- public int hashCode() {
- int hash = getValue().hashCode();
- hash = hash + getLabel().hashCode();
-
- return hash;
- }
-
- public boolean equals( Object obj ) {
- boolean equivalent = false;
-
- Lookup lookup = (Lookup)obj;
- if( lookup.getValue().equals(getValue()) && lookup.getLabel().equals(getLabel())) {
- equivalent = true;
- }
-
- return equivalent;
- }
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/RaptorAdapter.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/RaptorAdapter.java
deleted file mode 100644
index 99cc0272..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/RaptorAdapter.java
+++ /dev/null
@@ -1,368 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.adapter;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeSet;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.openecomp.portalsdk.analytics.system.AppUtils;
-import org.openecomp.portalsdk.core.domain.Menu;
-import org.openecomp.portalsdk.core.domain.MenuData;
-import org.openecomp.portalsdk.core.domain.Role;
-import org.openecomp.portalsdk.core.domain.RoleFunction;
-import org.openecomp.portalsdk.core.domain.User;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.service.DataAccessService;
-import org.openecomp.portalsdk.core.util.SystemProperties;
-import org.openecomp.portalsdk.core.web.support.UserUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-
-@Service("raptorAdapter")
-public class RaptorAdapter extends FusionAdapter {
-
- @Autowired
- private static DataAccessService dataAccessService;
-
- static EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(RaptorAdapter.class);
-
-
- public static final int RAPTOR_USER_ID = 20000; // RAPTOR system user id (for auditing purposes)
- public static final String RAPTOR_CONTROLLER_CLASSNAME = "org.openecomp.portalsdk.analytics.controller.Controller";
- public static final String KEY_USER_ROLES_CACHE = "userRoles";
-
- public void initializeRaptor() {
- org.openecomp.portalsdk.analytics.config.ConfigLoader.setConfigFilesPath(SystemProperties.getProperty(SystemProperties.RAPTOR_CONFIG_FILE_PATH));
- org.openecomp.portalsdk.analytics.system.Globals.initializeSystem(getServletContext());
- }
-
-
- /** Returns ID of the user currently logged in */
- public static String getUserID(HttpServletRequest request) {
- return String.valueOf(UserUtils.getUserId(request));
- //return null;
- }
-
- public static String getUserID(String user_id) {
- return user_id;
- }
-
-
- public static String getUserBackdoorLoginId(HttpServletRequest request) {
- if(AppUtils.getRequestNvlValue(request, "login_id").length()>0) return AppUtils.getRequestNvlValue(request, "login_id");
- return String.valueOf(UserUtils.getUserSession(request).getLoginId());
- }
-
- public static String getUserBackdoorLoginId(String user_id) {
- return getUserLoginId(user_id);
- }
-
- /** Obtains user name by ID */
- public static String getUserName(String userId) {
- Map<String, Long> params = new HashMap<String, Long>();
- params.put("user_id", new Long(userId));
-
- List list = getDataAccessService().executeNamedQuery("getUserNameById", params, null);
-
- String firstName = "";
- String lastName = "";
-
- if (list != null) {
- if (!list.isEmpty()) {
- Object[] user = (Object[]) list.get(0);
- firstName = (String) user[0]; // firstName scalar
- lastName = (String) user[1]; // lastName scalar
- }
- }
-
- return lastName + ", " + firstName;
- }
-
- public static String getUserName(HttpServletRequest request) {
- User user = UserUtils.getUserSession(request);
- return user.getLastName() + ", " + user.getFirstName();
- }
-
- public static String getUserEmail(String userId) {
- Map<String, Long> params = new HashMap<String, Long>();
- params.put("user_id", new Long(userId));
- List list = getDataAccessService().executeNamedQuery("getUserEmail", params, null);
- String email = "";
- if (list != null && !list.isEmpty())
- email = (String) list.get(0);
- return email;
- }
-
- public static String getUserEmail(HttpServletRequest request) {
- User user = UserUtils.getUserSession(request);
- return user.getEmail();
- }
-
- public static String getUserLoginId(String userId) {
-
- String loginId = "";
- try{
- List list = getDataAccessService().getList(User.class, " where user_id = " + userId, null, null);
- if (list != null) {
- if (!list.isEmpty()) {
- User user = (User)list.get(0);
- loginId = user.getLoginId(); // firstName scalar
- }
- }
- }catch(Exception e){
- logger.error(EELFLoggerDelegate.debugLogger, ("error while getting login id : Exception" + e.getMessage()));
- }
- return loginId;
- }
-
-
- public static String getUserLoginId(HttpServletRequest request) {
- User user = UserUtils.getUserSession(request);
- return user.getLoginId();
- }
-
- /** Obtains list of all users (in IdNameValue objects) */
- public static Map<Long, String> getAllUsers(String customizedQuery, String param, boolean isAdmin) {
- List users = null;
- Map<Long, String> map = new LinkedHashMap<Long, String>();
-
- if(customizedQuery.length()>0 && !isAdmin) {
-
- users = getDataAccessService().executeSQLQuery(customizedQuery, IdName.class, null);
-
- if (users != null) {
- Iterator i = users.iterator();
- while (i.hasNext()) {
- IdName item = (IdName)i.next();
- map.put(item.getId(), item.getName());
- }
- }
-
- } else {
- users = getDataAccessService().executeNamedQuery("getAllUsers", null, null);
- if (users != null) {
- Iterator i = users.iterator();
- while (i.hasNext()) {
- Object[] user = (Object[])i.next();
- Long id = (Long)user[0]; // id scalar
- String firstName = (String)user[1]; // firstName scalar
- String lastName = (String)user[2]; // lastName scalar
- map.put(id, lastName + ", " + firstName);
- }
- }
- }
- return map;
- }
-
- /** Obtains role name by ID */
- public static String getRoleName(String roleId) {
- Map<String, Long> params = new HashMap<String, Long>();
- params.put("role_id", new Long(roleId));
-
- List list = getDataAccessService().executeNamedQuery("getRoleNameById", params, null);
-
- String roleName = "";
-
- if (list != null) {
- if (!list.isEmpty()) {
- roleName = (String) list.get(0); // name scalar
- }
- }
-
- return roleName;
- }
-
- /** Obtains list of all roles (in IdNameValue objects) */
- public static Map<Long, String> getAllRolesUsingCustomizedQuery(String customizedQuery, String param, boolean isAdmin) {
- List roles = null;
-
- Map<Long, String> map = new LinkedHashMap<Long, String>();
-
- if(customizedQuery.length()>0 && !isAdmin) {
-
- roles = getDataAccessService().executeSQLQuery(customizedQuery, IdName.class, null);
-
- if (roles != null) {
- Iterator i = roles.iterator();
- while (i.hasNext()) {
- IdName item = (IdName)i.next();
- map.put(item.getId(), item.getName());
- }
- }
- } else {
-
- roles = getDataAccessService().executeNamedQuery("getAllRoles", null, null);
-
- if (roles != null) {
- Iterator i = roles.iterator();
- while (i.hasNext()) {
- Object[] role = (Object[])i.next();
- Long id = (Long)role[0]; // id scalar
- String name = (String)role[1]; // firstName scalar
- map.put(id, name);
- }
- }
- }
-
- return map;
- }
-
- public static Set getUserRoles(HttpServletRequest request) {
- return UserUtils.getRoles(request).keySet();
- }
-
- public static Set getUserRoles(String userId) {
- Set userRoles = new HashSet<Long>();
-// Map usersRolesMap = new LinkedHashMap<Long, Set>();
-// Map<String, Long> params = new HashMap<String, Long>();
-//
-// params.put("user_id", new Long(userId));
-//
-// List usersRolesList = getDataAccessService().executeNamedQuery("getAllUsersRoles", params, null);
-// Iterator i = usersRolesList.iterator();
-// while (i.hasNext()) {
-// Object[] userRole = (Object[]) i.next();
-//
-// Long roleId = (Long) userRole[1]; // role id scalar
-// userRoles.add(roleId);
-//
-// }
- userRoles = getActiveUsersRoleIds(new Long(userId));
-
-
- return userRoles;
- }
-
- /** this is used to get role for the current user. **/
- public static synchronized boolean isCurrentUserInRole(HttpServletRequest request, String roleId) {
- HttpSession session = request.getSession(false);
- if(session!=null && session.getAttribute(SystemProperties.getProperty(SystemProperties.USER_ATTRIBUTE_NAME))!=null)
- return UserUtils.hasRole(request, roleId);
- else
- return false;
- }
-
- // public static void processErrorNotification(HttpServletRequest request, Exception e) {
- //org.openecomp.portalsdk.core.web.support.AppUtils.processError(e, logger, request);
- //}
-
- /** Obtains menu label by ID */
- public static String getMenuLabel(String menuId) {
- return ((Menu) getDataAccessService().getDomainObject(MenuData.class, new Long(menuId), null)).getLabel();
- }
-
- public static String formatUserDateForDBTimeZone(String dateValue,String inPattern,
- Long userId, String outPattern)throws Exception{
- return DateUtils.formatUserDateForDBTimeZone(dateValue,inPattern,userId,outPattern);
- }
-
- public static String getCurrentDBDateForUser(String inPattern,Long userId)throws Exception{
- return DateUtils.getCurrentDBDateForUser(inPattern, userId);
- }
-
- public static Set<Long> getActiveUsersRoleIds(Long userId) {
- Set<Role> allActiveUserRoles = getActiveUserRoles(userId);
- Iterator<Role> allActiveUserRolesIterator = allActiveUserRoles.iterator();
- Set<Long> allActiveUserRoleIds = new TreeSet<Long>();
- while(allActiveUserRolesIterator.hasNext()){
- Role role = allActiveUserRolesIterator.next();
- allActiveUserRoleIds.add(role.getId());
- }
-
- return allActiveUserRoleIds;
- }
-
- public static Set<Long> getActiveUserRoleIds(Long userId) {
- Set<Role> allActiveUserRoles = getActiveUserRoles(userId);
- Iterator<Role> allActiveUserRolesIterator = allActiveUserRoles.iterator();
- Set<Long> allActiveUserRoleIds = new TreeSet<Long>();
- while(allActiveUserRolesIterator.hasNext()){
- Role role = allActiveUserRolesIterator.next();
- allActiveUserRoleIds.add(role.getId());
- }
-
- return allActiveUserRoleIds;
- }
-
- public static Set<RoleFunction> getActiveRoleFunctions(Long userId) {
- Set<Role> allActiveUserRoles = getActiveUserRoles(userId);
- Iterator<Role> allActiveUserRolesIterator = allActiveUserRoles.iterator();
- Set<RoleFunction> allActiveRoleFunctions = new TreeSet<RoleFunction>();
- while(allActiveUserRolesIterator.hasNext()){
- Role role = allActiveUserRolesIterator.next();
- allActiveRoleFunctions.addAll(role.getRoleFunctions());
- }
-
- return allActiveRoleFunctions;
- }
-
- public static Set<Role> getActiveUserRoles(Long userId) {
- User user = (User)getDataAccessService().getDomainObject(User.class,userId,null);
- Set<Role> allActiveUserRoles = new TreeSet<Role>();
- allActiveUserRoles.addAll(user.getRoles());
- Iterator<Role> userRolesIterator = user.getRoles().iterator();
- while(userRolesIterator.hasNext()){
- getAllChildRoles( userRolesIterator.next(),allActiveUserRoles);
- }
-
- Iterator<Role> allActiveUserRolesIterator = allActiveUserRoles.iterator();
- while(allActiveUserRolesIterator.hasNext()){
- Role role = allActiveUserRolesIterator.next();
- if(!role.getActive()){
- allActiveUserRolesIterator.remove();
- }
- }
-
- return allActiveUserRoles;
- }
-
- public static Set<Role> getAllChildRoles(Role role, Set<Role> allchildRoles) {
- Set<Role> childRoles = role.getChildRoles();
- allchildRoles.addAll(childRoles);
- Iterator<Role> childRolesIterator = childRoles.iterator();
- while (childRolesIterator.hasNext()) {
- getAllChildRoles(childRolesIterator.next(),allchildRoles);
- }
- return allchildRoles;
- }
-
-
- public static DataAccessService getDataAccessService() {
- return org.openecomp.portalsdk.core.web.support.AppUtils.getDataAccessService();
- }
-
-
- public static void setDataAccessService(DataAccessService dataAccessService) {
- dataAccessService = dataAccessService;
- }
-
-
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/SpringContext.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/SpringContext.java
deleted file mode 100644
index 1d46290a..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/adapter/SpringContext.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.adapter;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-@Component("springContext")
-public class SpringContext implements ApplicationContextAware {
- private static ApplicationContext context;
-
- public void setApplicationContext(ApplicationContext context) throws BeansException {
- this.context = context;
- }
- public static ApplicationContext getApplicationContext() {
- return context;
- }
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/controller/FileServletController.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/controller/FileServletController.java
deleted file mode 100644
index 203ee9cc..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/controller/FileServletController.java
+++ /dev/null
@@ -1,206 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.controller;
-/**
- * Raptor Blob Extract Servlet
- *
- */
-
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.OutputStream;
-import java.sql.Blob;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.service.DataAccessService;
-import org.springframework.web.servlet.ModelAndView;;
-
-
-public class FileServletController {
-
- private DataAccessService dataAccessService;
-
- EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(FileServletController.class);
-
-
- public ModelAndView handleRequestInternal(HttpServletRequest request,
- HttpServletResponse response) throws Exception {
- logger.debug(EELFLoggerDelegate.debugLogger, ("FileServletController:: f=" + request.getParameter("f")));
-
- String fname = request.getParameter("f");
-
- try {
- Map params = new HashMap();
- params.put("fname", fname);
-
- logger.debug(EELFLoggerDelegate.debugLogger, ("executing query: select file_blob from cr_report_file_history where file_name = :"
- + fname));
-
- List<Object> fileFromDB = (List<Object>) getDataAccessService().executeNamedQuery("getFileWithName", params, null);
-
- byte[] allBytesInBlob = null;
-
- if (fileFromDB != null && fileFromDB.size() > 0) {
-
- logger.debug(EELFLoggerDelegate.debugLogger, ("reading file blob from DB..."));
- try {
-
- /*for weblogic setup
- * if(Globals.isWeblogicServer()) {
- weblogic.jdbc.vendor.oracle.OracleThinBlob aBlob = (weblogic.jdbc.vendor.oracle.OracleThinBlob) ((org.hibernate.lob.SerializableBlob) fileFromDB
- .get(0)).getWrappedBlob();
- InputStream inBlob = ((java.sql.Blob) aBlob).getBinaryStream();
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- byte[] buf = new byte[1024];
- int n = 0;
- while ((n=inBlob.read(buf))>=0) {
- baos.write(buf, 0, n);
- }
- inBlob.close();
- allBytesInBlob = baos.toByteArray();
- } else { */
- /* works in Hinernate3 [ oracle.sql.BLOB aBlob = (oracle.sql.BLOB) ((org.hibernate.lob.SerializableBlob) fileFromDB
- .get(0)).getWrappedBlob();
- allBytesInBlob = aBlob.getBytes(1, (int) aBlob.length()); ] */
- // }
-
- Object fileFromDBType = fileFromDB.get(0);
- if(fileFromDBType instanceof byte[] ) // postgres
- allBytesInBlob = (byte[]) fileFromDB.get(0);
- else if (fileFromDBType instanceof Blob ) // oracle
- allBytesInBlob = ((Blob) fileFromDB.get(0)).getBytes(1, (int) ((Blob) fileFromDB.get(0)).length());
-
-
-
- } catch (Exception e) {
- logger.error(EELFLoggerDelegate.debugLogger, ("An exception has occurred: " + e.getMessage()));
- throw (e);
- }
-
- } else {
- logger.error(EELFLoggerDelegate.debugLogger, ("ERROR: No BLOB returned from DB..."));
- throw (new Exception("ERROR: No BLOB returned from DB..."));
- }
-
- serveFile(response, allBytesInBlob, fname);
- return null;
- } catch (Exception e) {
- logger.error(EELFLoggerDelegate.debugLogger, ("Exception occurred..." + e.getMessage()));
- Map<String, Object> errView = new HashMap<String, Object>();
- errView.put("error", "The requested resource was not found.");
- //return new ModelAndView(getExceptionView(), "model", errView);
- return null;
- }
-
- }
-
- private void serveFile(HttpServletResponse response, File inFile)
- throws Exception {
- OutputStream os = null;
- InputStream is = null;
- try {
- response.reset();
- is = new BufferedInputStream(new FileInputStream(inFile));
- os = new BufferedOutputStream(response.getOutputStream());
- response.setContentLength((int) inFile.length());
- response.setContentType("application/octet-stream");
- response.setHeader("Content-disposition", "attachment; filename=\""
- + inFile.getName() + "\"");
- copyStream(is, os);
- os.flush();
- } catch (Exception ex) {
- if (os == null)
- throw new Exception("Could not open output stream for file ");
- if (is == null)
- throw new Exception("Could not open input stream for file ");
- } finally {
- if (os != null) {
- os.close();
- }
- if (is != null)
- is.close();
- }
- }
-
- private void serveFile(HttpServletResponse response, byte[] outStream,
- String name) throws Exception {
- OutputStream os = null;
- InputStream is = null;
- try {
- response.reset();
- response.setContentLength((int) outStream.length);
- response.setContentType("application/octet-stream");
- response.setHeader("Content-disposition", "attachment; filename=\""
- + name + "\"");
- copyStream(response, outStream);
- } catch (Exception ex) {
- if (os == null)
- throw new Exception("Could not open output stream for file ");
- if (is == null)
- throw new Exception("Could not open input stream for file ");
- } finally {
- if (os != null) {
- os.close();
- }
- if (is != null)
- is.close();
- }
- }
-
- private int copyStream(InputStream in, OutputStream out) throws IOException {
- int bytes, totalBytes = 0;
-
- byte[] b = new byte[4096];
-
- while ((bytes = in.read(b, 0, b.length)) != -1) {
- totalBytes += bytes;
- out.write(b, 0, bytes);
- }
- return totalBytes;
- }
-
- private int copyStream(HttpServletResponse response, byte[] outStream)
- throws IOException {
-
- OutputStream os = new BufferedOutputStream(response.getOutputStream());
- os.write(outStream);
- os.flush();
- return outStream.length;
- }
-
- public DataAccessService getDataAccessService() {
- return dataAccessService;
- }
-
- public void setDataAccessService(DataAccessService dataAccessService) {
- this.dataAccessService = dataAccessService;
- }
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/CR_Report.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/CR_Report.java
deleted file mode 100644
index 9f6ed7d6..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/CR_Report.java
+++ /dev/null
@@ -1,306 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.domain;
-
-
-import java.util.Date;
-
-import org.openecomp.portalsdk.core.domain.User;
-import org.openecomp.portalsdk.core.domain.support.DomainVo;;
-
-/**
- * <p>CR_Report.java</p>
- * <p>Represents a RAPTOR report data object.</p>
- *
- * @version 1.0
- */
-public class CR_Report extends DomainVo {
-
- private String title;
- private String descr;
- private String public_yn;
- //private String report_xml;
- private Date createDate;
- private Date maintDate;
- private String menuId;
- private String menuApproved_YN;
- private User ownerId;
- private Long folderId;
- private String dashboard_type_YN;
- private String dashboard_yn;
- private User createId;
- private User maintId;
-
-/*
- //New Buttons
- private String copyImagePath = "/static/fusion/raptor/img/cross-small.png" ;
- private String editImagePath = "/static/fusion/raptor/img/pencil-small.png" ;
- private String deleteImagePath = "/static/fusion/raptor/img/DeleteCross-16x16.png" ;
- private String scheduleImagePath = "/static/fusion/raptor/img/Calendar-16x16.png" ;
- private String runImagePath = "/static/fusion/raptor/img/tick-small.png" ;
-
-*/
- //private Set reportAccess = new TreeSet();
-
- public CR_Report() {}
-
-
-
- /**
- * @return the title
- */
- public String getTitle() {
- return title;
- }
-
-
-
- /**
- * @param title the title to set
- */
- public void setTitle(String title) {
- this.title = title;
- }
-
-
-
- /**
- * @return the descr
- */
- public String getDescr() {
- return descr;
- }
-
-
-
- /**
- * @param descr the descr to set
- */
- public void setDescr(String descr) {
- this.descr = descr;
- }
-
-
-
- /**
- * @return the public_yn
- */
- public String getPublic_yn() {
- return public_yn;
- }
-
-
-
- /**
- * @param public_yn the public_yn to set
- */
- public void setPublic_yn(String public_yn) {
- this.public_yn = public_yn;
- }
-
-
- /**
- * @return the createDate
- */
- public Date getCreateDate() {
- return createDate;
- }
-
-
-
- /**
- * @param createDate the createDate to set
- */
- public void setCreateDate(Date createDate) {
- this.createDate = createDate;
- }
-
-
- /**
- * @return the maintDate
- */
- public Date getMaintDate() {
- return maintDate;
- }
-
-
-
- /**
- * @param maintDate the maintDate to set
- */
- public void setMaintDate(Date maintDate) {
- this.maintDate = maintDate;
- }
-
-
-
- /**
- * @return the menuId
- */
- public String getMenuId() {
- return menuId;
- }
-
-
-
- /**
- * @param menuId the menuId to set
- */
- public void setMenuId(String menuId) {
- this.menuId = menuId;
- }
-
-
-
- /**
- * @return the menuApproved_YN
- */
- public String getMenuApproved_YN() {
- return menuApproved_YN;
- }
-
-
-
- /**
- * @param menuApproved_YN the menuApproved_YN to set
- */
- public void setMenuApproved_YN(String menuApproved_YN) {
- this.menuApproved_YN = menuApproved_YN;
- }
-
-
-
-
- /**
- * @return the folderId
- */
- public Long getFolderId() {
- return folderId;
- }
-
-
-
- /**
- * @param folderId the folderId to set
- */
- public void setFolderId(Long folderId) {
- this.folderId = folderId;
- }
-
-
-
- /**
- * @return the dashboard_type_YN
- */
- public String getDashboard_type_YN() {
- return dashboard_type_YN;
- }
-
-
-
- /**
- * @param dashboard_type_YN the dashboard_type_YN to set
- */
- public void setDashboard_type_YN(String dashboard_type_YN) {
- this.dashboard_type_YN = dashboard_type_YN;
- }
-
-
-
- /**
- * @return the dashboard_yn
- */
- public String getDashboard_yn() {
- return dashboard_yn;
- }
-
-
-
- /**
- * @param dashboard_yn the dashboard_yn to set
- */
- public void setDashboard_yn(String dashboard_yn) {
- this.dashboard_yn = dashboard_yn;
- }
-
-
-
- /**
- * @return the ownerId
- */
- public User getOwnerId() {
- return ownerId;
- }
-
-
-
- /**
- * @param ownerId the ownerId to set
- */
- public void setOwnerId(User ownerId) {
- this.ownerId = ownerId;
- }
-
-
-
- /**
- * @return the createId
- */
- public User getCreateId() {
- return createId;
- }
-
-
-
- /**
- * @param createId the createId to set
- */
- public void setCreateId(User createId) {
- this.createId = createId;
- }
-
-
-
- /**
- * @return the maintId
- */
- public User getMaintId() {
- return maintId;
- }
-
-
-
- /**
- * @param maintId the maintId to set
- */
- public void setMaintId(User maintId) {
- this.maintId = maintId;
- }
-
-
-
- public int compareTo(Object obj){
- String c1 = getTitle();
- String c2 = ((CR_Report)obj).getTitle();
-
- return (c1 == null || c2 == null) ? 1 : c1.compareTo(c2);
- }
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/QuickLink.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/QuickLink.java
deleted file mode 100644
index 75b2d119..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/QuickLink.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.domain;
-
-public class QuickLink {
-
- private String reportURL;
- private String reportName;
- private String reportDescr;
- private Boolean showDescr;
-
- public String getReportURL() {
- return reportURL;
- }
-
- public void setReportURL(String reportURL) {
- this.reportURL = reportURL;
- }
-
- public String getReportName() {
- return reportName;
- }
-
- public void setReportName(String reportName) {
- this.reportName = reportName;
- }
-
- public String getReportDescr() {
- return reportDescr;
- }
-
- public void setReportDescr(String reportDescr) {
- this.reportDescr = reportDescr;
- }
-
- public Boolean getShowDescr() {
- return showDescr;
- }
-
- public void setShowDescr(Boolean showDescr) {
- this.showDescr = showDescr;
- }
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/RaptorSearch.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/RaptorSearch.java
deleted file mode 100644
index cb85f368..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/RaptorSearch.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.domain;
-
-import java.util.Date;
-
-import org.openecomp.portalsdk.analytics.system.Globals;
-import org.openecomp.portalsdk.core.domain.support.DomainVo;;
-
-public class RaptorSearch extends DomainVo {
-
- private Long repId;
- private String title;
- private String descr;
- private String ownerName;
- private Date createDate;
- private String canEdit;
- private String readOnly;
- private String schedule;
- // private Long countRows;
-
- /**
- * @return the repId
- */
- public Long getRepId() {
- return repId;
- }
-
- /**
- * @param repId
- * the repId to set
- */
- public void setRepId(Long repId) {
- this.repId = repId;
- }
-
- /**
- * @return the title
- */
- public String getTitle() {
- return title;
- }
-
- /**
- * @param title
- * the title to set
- */
- public void setTitle(String title) {
- this.title = title;
- }
-
- /**
- * @return the descr
- */
- public String getDescr() {
- return descr;
- }
-
- /**
- * @param descr
- * the descr to set
- */
- public void setDescr(String descr) {
- this.descr = descr;
- }
-
- /**
- * @return the createDate
- */
- public Date getCreateDate() {
- return createDate;
- }
-
- /**
- * @param createDate
- * the createDate to set
- */
- public void setCreateDate(Date createDate) {
- this.createDate = createDate;
- }
-
- /**
- * @return the ownerName
- */
- public String getOwnerName() {
- return ownerName;
- }
-
- /**
- * @param ownerName
- * the ownerName to set
- */
- public void setOwnerName(String ownerName) {
- this.ownerName = ownerName;
- }
-
- /**
- * @return the schedule
- */
- public String getSchedule() {
- return schedule;
- }
-
- /**
- * @param schedule
- * the schedule to set
- */
- public void setSchedule(String schedule) {
- this.schedule = schedule;
- }
-
- /**
- * @return the canEdit
- */
- public String getCanEdit() {
- return canEdit;
- }
-
- /**
- * @param canEdit
- * the canEdit to set
- */
- public void setCanEdit(String canEdit) {
- this.canEdit = canEdit;
- }
-
- /**
- * @return the canDelete
- */
- public boolean canDelete() {
- String s = getCanEdit();
- if (s != null && s.length() > 0 && s.equals("Y")) {
- return true;
- }
- return false;
- }
-
- /**
- * @return the canCopy
- */
- public boolean canCopy() {
- String s = getReadOnly();
- if (returnTrueOrFalse(s)) {
- return Globals.getCanCopyOnReadOnly() ? true : returnTrueOrFalse(getCanEdit());
- }
- return true;
- }
-
- /**
- * @return the readOnly
- */
- public String getReadOnly() {
- return readOnly;
- }
-
- /**
- * @param readOnly
- * the readOnly to set
- */
- public void setReadOnly(String readOnly) {
- this.readOnly = readOnly;
- }
-
- private boolean returnTrueOrFalse(String s) {
- if (s != null && s.length() > 0 && s.equals("Y")) {
- return true;
- }
- return false;
- }
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/ReportInfo.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/ReportInfo.java
deleted file mode 100644
index e11f3bcb..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/domain/ReportInfo.java
+++ /dev/null
@@ -1,159 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.domain;
-
-import java.util.Date;
-
-public class ReportInfo {
-
- private Long repId;
- private String title;
- private String createUser;
- private String ownerName;
- private Date createDate;
- private Long lastAccessed = -1L;
- private Long lastWeekAccess;
- private Long lastMonthAccess;
- private Long lastYearAccess;
- private Long userAccessCount;
- /**
- * @return the repId
- */
- public Long getRepId() {
- return repId;
- }
- /**
- * @param repId the repId to set
- */
- public void setRepId(Long repId) {
- this.repId = repId;
- }
- /**
- * @return the title
- */
- public String getTitle() {
- return title;
- }
- /**
- * @param title the title to set
- */
- public void setTitle(String title) {
- this.title = title;
- }
- /**
- * @return the createUser
- */
- public String getCreateUser() {
- return createUser;
- }
- /**
- * @param createUser the createUser to set
- */
- public void setCreateUser(String createUser) {
- this.createUser = createUser;
- }
- /**
- * @return the ownerName
- */
- public String getOwnerName() {
- return ownerName;
- }
- /**
- * @param ownerName the ownerName to set
- */
- public void setOwnerName(String ownerName) {
- this.ownerName = ownerName;
- }
- /**
- * @return the createDate
- */
- public Date getCreateDate() {
- return createDate;
- }
- /**
- * @param createDate the createDate to set
- */
- public void setCreateDate(Date createDate) {
- this.createDate = createDate;
- }
- /**
- * @return the lastAccessed
- */
- public Long getLastAccessed() {
- return lastAccessed;
- }
- /**
- * @param lastAccessed the lastAccessed to set
- */
- public void setLastAccessed(Long lastAccessed) {
- this.lastAccessed = lastAccessed;
- }
- /**
- * @return the lastWeekAccess
- */
- public Long getLastWeekAccess() {
- return lastWeekAccess;
- }
- /**
- * @param lastWeekAccess the lastWeekAccess to set
- */
- public void setLastWeekAccess(Long lastWeekAccess) {
- this.lastWeekAccess = lastWeekAccess;
- }
- /**
- * @return the lastMonthAccess
- */
- public Long getLastMonthAccess() {
- return lastMonthAccess;
- }
- /**
- * @param lastMonthAccess the lastMonthAccess to set
- */
- public void setLastMonthAccess(Long lastMonthAccess) {
- this.lastMonthAccess = lastMonthAccess;
- }
- /**
- * @return the lastYearAccess
- */
- public Long getLastYearAccess() {
- return lastYearAccess;
- }
- /**
- * @param lastYearAccess the lastYearAccess to set
- */
- public void setLastYearAccess(Long lastYearAccess) {
- this.lastYearAccess = lastYearAccess;
- }
- /**
- * @return the userAccessCount
- */
- public Long getUserAccessCount() {
- return userAccessCount;
- }
- /**
- * @param userAccessCount the userAccessCount to set
- */
- public void setUserAccessCount(Long userAccessCount) {
- this.userAccessCount = userAccessCount;
- }
-
-
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/service/RaptorService.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/service/RaptorService.java
deleted file mode 100644
index 26276579..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/service/RaptorService.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.service;
-
-import java.util.List;
-import java.util.Map;
-
-
-
-public interface RaptorService {
- public void deleteReport(Long reportId);
- public List getReportInfo(Map params);
- public int getTotalSize();
- public int executeCountQuery(Class entity, String query, Map params, String whereClause);
- public List executeGridQuery(String query, Map params, Integer fromIndex, Integer toIndex);
- public List executeGridQueryOrderByWithLimit(Class entity, String query, Map params, String _orderBy, boolean _asc, Integer fromIndex, Integer toIndex);
- public List executeGridQuery(Class entity, String query, String whereClause, Map params, Integer fromIndex, Integer toIndex);
- public List executeGridQueryOrderByWithLimit(Class entity, String query, String whereClause, Map params, String _orderBy, boolean _asc, Integer fromIndex, Integer toIndex);
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/service/RaptorServiceImpl.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/service/RaptorServiceImpl.java
deleted file mode 100644
index e8e0cf31..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/service/RaptorServiceImpl.java
+++ /dev/null
@@ -1,163 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.service;
-
-import java.util.List;
-import java.util.Map;
-
-import org.openecomp.portalsdk.analytics.system.fusion.domain.CR_Report;
-import org.openecomp.portalsdk.core.service.DataAccessService;
-import org.openecomp.portalsdk.core.service.support.FusionService;
-import org.springframework.context.ApplicationContext;
-
-public class RaptorServiceImpl extends FusionService implements RaptorService {
-
- private DataAccessService dataAccessService;
-
- private int totalSize;
-
- public DataAccessService getDataAccessService() {
- return dataAccessService;
- }
-
- public void setDataAccessService(DataAccessService dataAccessService) {
- this.dataAccessService = dataAccessService;
- }
-
- private ApplicationContext applicationContext;
-
- //raptorSearchAllReportsCount
-
- public int executeCountQuery(Class entity, String query, Map params, String whereClause) {
- List l = getDataAccessService().executeNamedCountQuery(entity, query, whereClause, params);
- //List l = getDataAccessService().executeNamedQuery(query, params, null);
- int searchCount = 0;
- if(l != null) {
- if (!l.isEmpty()) {
- searchCount = (((Long) l.get(0))).intValue();
- }
- }
- totalSize = searchCount;
- return totalSize;
- }
-
- //raptorSearchAllReports
- public List executeGridQuery(String query, Map params, Integer fromIndex, Integer toIndex) {
- return getDataAccessService().executeNamedQuery(query, params, fromIndex, toIndex, null);
- }
-
- public List executeGridQueryOrderByWithLimit(Class entity, String query, Map params, String _orderBy, boolean asc, Integer fromIndex, Integer toIndex) {
- return getDataAccessService().executeNamedQueryWithOrderBy(entity, query, params, _orderBy, asc, fromIndex, toIndex, null);
- }
-
- //with where clause
- public List executeGridQuery(Class entity, String query, String whereClause, Map params, Integer fromIndex, Integer toIndex) {
- return getDataAccessService().executeNamedQuery(entity, query, whereClause, params, fromIndex, toIndex, null);
- }
-
- public List executeGridQueryOrderByWithLimit(Class entity, String query, String whereClause, Map params, String _orderBy, boolean asc, Integer fromIndex, Integer toIndex) {
- return getDataAccessService().executeNamedQueryWithOrderBy(entity, query, whereClause, params, _orderBy, asc, fromIndex, toIndex, null);
- }
-
- /*
- public int getUserReportsCount(Map params) {
- List l = getDataAccessService().executeNamedQuery("raptorSearchUserReportsCount", params, null);
- int count = 0;
- if(l != null) {
- if (!l.isEmpty()) {
- Object[] result = (Object[]) l.get(0);
- count = ((Long)result[0]).intValue();
- }
- }
- totalSize = count;
- return totalSize;
- }
-
- public List getUserReports(Map params, Integer fromIndex, Integer toIndex) {
- return getDataAccessService().executeNamedQuery("raptorSearchUserReports", params, fromIndex, toIndex, null);
- }
-
- public int getPublicReportsCount(Map params) {
- List l = getDataAccessService().executeNamedQuery("raptorPublicUserReportsCount", params, null);
- int count = 0;
- if(l != null) {
- if (!l.isEmpty()) {
- Object[] result = (Object[]) l.get(0);
- count = ((Long)result[0]).intValue();
- }
- }
- totalSize = count;
- return totalSize;
- }
-
- public List getPublicReports(Map params, Integer fromIndex, Integer toIndex) {
- return getDataAccessService().executeNamedQuery("raptorPublicUserReports", params, fromIndex, toIndex, null);
- }
-
- public int getFavReportsCount(Map params) {
- List l = getDataAccessService().executeNamedQuery("raptorSearchFavReportsCount", params, null);
- int count = 0;
- if(l != null) {
- if (!l.isEmpty()) {
- Object[] result = (Object[]) l.get(0);
- count = ((Long)result[0]).intValue();
- }
- }
- totalSize = count;
- return totalSize;
- }
-
- public List getFavReports(Map params, Integer fromIndex, Integer toIndex) {
- return getDataAccessService().executeNamedQuery("raptorSearchFavReports", params, fromIndex, toIndex, null);
- }
- */
- public int getTotalSize() {
- return totalSize;
- }
-
- public void deleteReport(Long reportId) {
- getDataAccessService().deleteDomainObject(getDataAccessService().getDomainObject(CR_Report.class, reportId, null), null);
- }
-
- public List getReportInfo(Map params) {
- return getDataAccessService().executeNamedQuery("raptorInfoQuery", params, null);
- }
-
-/* public List executeGridQueryWithOrderBy(String query, Map params, String _orderBy, boolean asc, Integer fromIndex, Integer toIndex) {
- query = String.format(query, _orderBy, asc ? "ASC" : "DESC", fromIndex, toIndex);
- DataSource ds = (DataSource)getApplicationContext().getBean(searchBean.getDatasourceName());
- NamedParameterJdbcTemplate jdbcTemplate = new NamedParameterJdbcTemplate(ds);
- }*/
-
- /**
- * @return the applicationContext
- */
- public ApplicationContext getApplicationContext() {
- return applicationContext;
- }
-
- /**
- * @param applicationContext the applicationContext to set
- */
- public void setApplicationContext(ApplicationContext applicationContext) {
- this.applicationContext = applicationContext;
- }
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/RaptorController.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/RaptorController.java
deleted file mode 100644
index 417a8e19..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/RaptorController.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.web;
-
-
-import java.io.IOException;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.openecomp.portalsdk.analytics.controller.Action;
-import org.openecomp.portalsdk.analytics.controller.ErrorHandler;
-import org.openecomp.portalsdk.analytics.error.RaptorException;
-import org.openecomp.portalsdk.analytics.error.RaptorRuntimeException;
-import org.openecomp.portalsdk.analytics.system.Globals;
-import org.openecomp.portalsdk.analytics.util.AppConstants;
-import org.openecomp.portalsdk.core.controller.RestrictedBaseController;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.servlet.ModelAndView;
-
-@Controller
-@RequestMapping("/")
-public class RaptorController extends RestrictedBaseController{
- String viewName;
- //static org.apache.log4j.Logger s_logger = org.apache.log4j.Logger.getLogger(RaptorController.class.getName());
-
- @RequestMapping(value = {"/report" }, method = RequestMethod.GET)
- public ModelAndView report(HttpServletRequest request) {
- request.getSession().setAttribute("isEmbedded", false);
- viewName = "report";
- return new ModelAndView(getViewName());
- }
-
- @RequestMapping(value = {"/report_embedded" }, method = RequestMethod.GET)
- public ModelAndView embededReport(HttpServletRequest request) {
- request.getSession().setAttribute("isEmbedded", true);
- viewName = "report_embedded";
- return new ModelAndView(getViewName());
- }
-
- @RequestMapping(value = {"/report_sample" }, method = RequestMethod.GET)
- public ModelAndView reportSample(HttpServletRequest request) {
- viewName = "report_sample";
- return new ModelAndView(getViewName());
- }
-
- @RequestMapping(value = {"/report_import.htm" }, method = RequestMethod.GET)
-
- public ModelAndView RaptorWizard1(HttpServletRequest request, HttpServletResponse response) throws IOException {
- viewName = "report_import";
- Action action = null;
- String actionKey = "report.import";
- ServletContext servletContext = request.getSession().getServletContext();
- if( !Globals.isSystemInitialized()) {
- Globals.initializeSystem(servletContext);
- }
- try {
- action = Globals.getRaptorActionMapping().getAction(actionKey);
- if (action == null)
- throw new RaptorRuntimeException("Action not found");
- } catch (RaptorException e) {
- logger.debug(EELFLoggerDelegate.debugLogger, ("[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. RaptorException: " + e.getMessage()));
- viewName = (new ErrorHandler()).processFatalError(request, new RaptorRuntimeException(
- "[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. Exception: " + e.getMessage()));
- }
- return new ModelAndView(getViewName(), "model", null);
- }
-
-
- @RequestMapping(value = {"/report_wizard.htm" }, method = {RequestMethod.POST, RequestMethod.GET})
- public ModelAndView RaptorWizard(HttpServletRequest request, HttpServletResponse response) throws IOException {
-
-
- viewName = "";
- String actionKey = nvl(request.getParameter(AppConstants.RI_ACTION), request.getParameter("action"));
- actionKey = nvl(actionKey, "report.run");
- Action action = null;
- ServletContext servletContext = request.getSession().getServletContext();
- if( !Globals.isSystemInitialized()) {
- Globals.initializeSystem(servletContext);
- }
- try {
- action = Globals.getRaptorActionMapping().getAction(actionKey);
- if (action == null)
- throw new RaptorRuntimeException("Action not found");
- } catch (RaptorException e) {
- logger.debug(EELFLoggerDelegate.debugLogger, ("[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. RaptorException: " + e.getMessage()));
- viewName = (new ErrorHandler()).processFatalError(request, new RaptorRuntimeException(
- "[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. Exception: " + e.getMessage()));
- }
-
- try {
- Class[] paramTypes = new Class[2];
- paramTypes[0] = Class.forName("javax.servlet.http.HttpServletRequest");
- paramTypes[1] = Class.forName("java.lang.String");
-
- Class handlerClass = Class.forName(action.getControllerClass());
- Object handler = handlerClass.newInstance();
- Method handlerMethod = handlerClass.getMethod(action.getControllerMethod(),
- paramTypes);
-
- Object[] paramValues = new Object[2];
- paramValues[0] = request;
- paramValues[1] = action.getJspName();;
-
- viewName = (String) handlerMethod.invoke(handler, paramValues);
- //ObjectMapper mapper = new ObjectMapper();
- //response.setContentType("application/json");
- //PrintWriter out = response.getWriter();
- //out.write(viewName);
-
- } catch (ClassNotFoundException e) {
- logger.debug(EELFLoggerDelegate.debugLogger, ("[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. ClassNotFoundException: " + e.getMessage()));
- viewName = (new ErrorHandler()).processFatalError(request, new RaptorRuntimeException(
- "[Controller.processRequest] Unable to instantiate and invoke action handler. Exception: "
- + e.getMessage()));
- } catch (IllegalAccessException e) {
- logger.debug(EELFLoggerDelegate.debugLogger, ("[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. IllegalAccessException: " + e.getMessage()));
- viewName = (new ErrorHandler()).processFatalError(request, new RaptorRuntimeException(
- "[Controller.processRequest] Unable to instantiate and invoke action handler. Exception: "
- + e.getMessage()));
- }catch (InstantiationException e) {
- logger.debug(EELFLoggerDelegate.debugLogger, ("Ocurring during Schedule "));
- viewName = (new ErrorHandler()).processFatalError(request, new RaptorRuntimeException(
- "[Controller.processRequest] Unable to instantiate and invoke action handler. Exception: "
- + e.getMessage()));
- }catch (NoSuchMethodException e) {
- logger.debug(EELFLoggerDelegate.debugLogger, ("[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. NoSuchMethodException: " + e.getMessage()));
- viewName = (new ErrorHandler()).processFatalError(request, new RaptorRuntimeException(
- "[Controller.processRequest] Unable to instantiate and invoke action handler. Exception: "
- + e.getMessage()));
- }catch (InvocationTargetException e) {
- logger.debug(EELFLoggerDelegate.debugLogger, ("[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. InvocationTargetException: " + e.getMessage()));
- viewName = (new ErrorHandler()).processFatalError(request, new RaptorRuntimeException(
- "[Controller.processRequest] Unable to instantiate and invoke action handler. Exception: "
- + e.getMessage()));
- }
- return new ModelAndView(getViewName(), "model", null);
- }
-
- public String getViewName() {
- return viewName;
- }
- public void setViewName(String viewName) {
- this.viewName = viewName;
- }
-
- public String nvl(String s) {
- return (s == null) ? "" : s;
- }
-
- public String nvl(String s, String sDefault) {
- return nvl(s).equals("") ? sDefault : s;
- }
-
- EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(RaptorController.class);
-
-
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java
deleted file mode 100644
index bd3fdce3..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/RaptorControllerAsync.java
+++ /dev/null
@@ -1,410 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.web;
-
-
-import java.io.IOException;
-import java.io.OutputStreamWriter;
-import java.io.PrintWriter;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
-
-import org.openecomp.portalsdk.analytics.controller.Action;
-import org.openecomp.portalsdk.analytics.controller.ErrorHandler;
-import org.openecomp.portalsdk.analytics.error.RaptorException;
-import org.openecomp.portalsdk.analytics.error.RaptorRuntimeException;
-import org.openecomp.portalsdk.analytics.model.ReportHandler;
-import org.openecomp.portalsdk.analytics.model.pdf.PdfReportHandler;
-import org.openecomp.portalsdk.analytics.model.runtime.CategoryAxisJSON;
-import org.openecomp.portalsdk.analytics.model.runtime.ChartJSON;
-import org.openecomp.portalsdk.analytics.model.runtime.RangeAxisJSON;
-import org.openecomp.portalsdk.analytics.model.runtime.ReportRuntime;
-import org.openecomp.portalsdk.analytics.system.AppUtils;
-import org.openecomp.portalsdk.analytics.system.Globals;
-import org.openecomp.portalsdk.analytics.util.AppConstants;
-import org.openecomp.portalsdk.analytics.view.ReportData;
-import org.openecomp.portalsdk.analytics.xmlobj.DataColumnType;
-import org.openecomp.portalsdk.core.controller.UnRestrictedBaseController;
-import org.openecomp.portalsdk.core.domain.User;
-import org.openecomp.portalsdk.core.logging.logic.EELFLoggerDelegate;
-import org.openecomp.portalsdk.core.web.support.UserUtils;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-@Controller
-@RequestMapping("/")
-public class RaptorControllerAsync extends UnRestrictedBaseController{
- String viewName;
-
- @RequestMapping(value = {"/raptor.htm" }, method = RequestMethod.GET)
- public void RaptorSearch(HttpServletRequest request, HttpServletResponse response) throws IOException {
-
- /* List items = null;
- int reportId = ServletRequestUtils.getIntParameter(request, "report_id", 0);
- //String task = ServletRequestUtils.getStringParameter(request, "task", TASK_GET);
-
- HashMap additionalParams = new HashMap();
- additionalParams.put(Parameters.PARAM_HTTP_REQUEST, request);
-
- return new ModelAndView(getViewName(), "model", null);
-
- //return new ModelAndView(getViewName(), "model", null);
- //System.out.println("Fill with proper code");
- //return null;*/
- viewName = "";
- String actionKey = nvl(request.getParameter(AppConstants.RI_ACTION), request.getParameter("action"));
- actionKey = nvl(actionKey, "report.run");
-
- HttpSession session = request.getSession();
- User user = UserUtils.getUserSession(request);
-
- if(actionKey.equals("report.download.excel2007.session") || actionKey.equals("report.download.csv.session") || actionKey.equals("report.download.excel.session") || actionKey.equals("report.download.pdf.session") ) {
- if(session!=null && user!=null){
- ServletContext servletContext = request.getSession().getServletContext();
- if( !Globals.isSystemInitialized()) {
- Globals.initializeSystem(servletContext);
- }
- ReportRuntime rr = null;
- ReportData rd = null;
- String parent = "";
- int parentFlag = 0;
- if(!nvl(request.getParameter("parent"), "").equals("N")) parent = nvl(request.getParameter("parent"), "");
- if(parent.startsWith("parent_")) parentFlag = 1;
- if(parentFlag == 1) {
- rr = (ReportRuntime) request.getSession().getAttribute(parent+"_rr");
- rd = (ReportData) request.getSession().getAttribute(parent+"_rd");
- }
-
- boolean isEmbedded = false;
- Object temp = request.getSession().getAttribute("isEmbedded");
- if(temp!=null){
- isEmbedded = (boolean)temp;
- }
- if(isEmbedded){
- String reportID = AppUtils.getRequestValue(request, AppConstants.RI_REPORT_ID);
- if(rr==null) rr = (ReportRuntime) ((HashMap)request.getSession().getAttribute(AppConstants.EMBEDDED_REPORTRUNTIME_MAP)).get(reportID);
- if(rd==null) rd = (ReportData) ((HashMap)request.getSession().getAttribute(AppConstants.EMBEDDED_REPORTDATA_MAP)).get(reportID);
- } else {
- if(rr==null) rr = (ReportRuntime) request.getSession().getAttribute(AppConstants.SI_REPORT_RUNTIME);
- if(rd==null) rd = (ReportData) request.getSession().getAttribute(AppConstants.RI_REPORT_DATA);
- }
- String user_id = AppUtils.getUserID(request);
- try {
- OutputStreamWriter out = new OutputStreamWriter(response.getOutputStream());
-
- if(actionKey.equals("report.download.pdf.session")) {
- new PdfReportHandler().createPdfFileContent(request,response, 3);
- } else if (actionKey.equals("report.download.csv.session")) {
- (new ReportHandler()).createCSVFileContent(out, rd, rr, request, response);
- } else if (actionKey.equals("report.download.excel.session")) {
- new ReportHandler().createExcelFileContent(out, rd, rr, request, response, user_id, 3); //3 whole
- } else {
-
- new ReportHandler().createExcel2007FileContent(out, rd, rr, request, response, user_id, 3); //3 whole
- }
- } catch(Exception e) {
- e.printStackTrace();
- //Log.write("Fatal error [report_download_xlsx.jsp]: "+e.getMessage());
- }
- } else {
- response.sendRedirect("login.htm");
- }
- } else {
- if(session!=null && user!=null){
- Action action = null;
- ServletContext servletContext = request.getSession().getServletContext();
- if( !Globals.isSystemInitialized()) {
- Globals.initializeSystem(servletContext);
- }
- try {
- action = Globals.getRaptorActionMapping().getAction(actionKey);
- if (action == null)
- throw new RaptorRuntimeException("Action not found");
- } catch (RaptorException e) {
- logger.debug(EELFLoggerDelegate.debugLogger, ("[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. RaptorException: " + e.getMessage()));
-
- viewName = (new ErrorHandler()).processFatalError(request, new RaptorRuntimeException(
- "[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. Exception: " + e.getMessage()));
- }
-
- try {
- Class[] paramTypes = new Class[2];
- paramTypes[0] = Class.forName("javax.servlet.http.HttpServletRequest");
- paramTypes[1] = Class.forName("java.lang.String");
-
- Class handlerClass = Class.forName(action.getControllerClass());
- Object handler = handlerClass.newInstance();
- Method handlerMethod = handlerClass.getMethod(action.getControllerMethod(),
- paramTypes);
-
- Object[] paramValues = new Object[2];
- paramValues[0] = request;
- paramValues[1] = action.getJspName();;
-
- viewName = (String) handlerMethod.invoke(handler, paramValues);
- //ObjectMapper mapper = new ObjectMapper();
- if(!actionKey.equals("chart.run"))
- response.setContentType("application/json");
- else
- response.setContentType("text/html");
- PrintWriter out = response.getWriter();
- out.write(viewName);
-
- } catch (ClassNotFoundException e) {
- logger.debug(EELFLoggerDelegate.debugLogger, ("[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. ClassNotFoundException: " + e.getMessage()));
- viewName = (new ErrorHandler()).processFatalError(request, new RaptorRuntimeException(
- "[Controller.processRequest] Unable to instantiate and invoke action handler. Exception: "
- + e.getMessage()));
- } catch (IllegalAccessException e) {
- logger.debug(EELFLoggerDelegate.debugLogger, ("[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. IllegalAccessException: " + e.getMessage()));
- viewName = (new ErrorHandler()).processFatalError(request, new RaptorRuntimeException(
- "[Controller.processRequest] Unable to instantiate and invoke action handler. Exception: "
- + e.getMessage()));
- }catch (InstantiationException e) {
- logger.debug(EELFLoggerDelegate.debugLogger, ("[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. InstantiationException: " + e.getMessage()));
- viewName = (new ErrorHandler()).processFatalError(request, new RaptorRuntimeException(
- "[Controller.processRequest] Unable to instantiate and invoke action handler. Exception: "
- + e.getMessage()));
- }catch (NoSuchMethodException e) {
- logger.debug(EELFLoggerDelegate.debugLogger, ("[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. NoSuchMethodException: " + e.getMessage()));
- viewName = (new ErrorHandler()).processFatalError(request, new RaptorRuntimeException(
- "[Controller.processRequest] Unable to instantiate and invoke action handler. Exception: "
- + e.getMessage()));
- }catch (InvocationTargetException e) {
- e.printStackTrace();
- logger.debug(EELFLoggerDelegate.debugLogger, ("[Controller.processRequest]Invalid raptor action [" + actionKey
- + "]. InvocationTargetException: " + e.getMessage()));
- viewName = (new ErrorHandler()).processFatalError(request, new RaptorRuntimeException(
- "[Controller.processRequest] Unable to instantiate and invoke action handler. Exception: "
- + e.getMessage()));
- }
- //return new ModelAndView(getViewName(), "model", null);
- } else {
- PrintWriter out = response.getWriter();
- out.write("session has timed out for user");
- }
-
- }
- }
-
- @RequestMapping(value = "save_chart", method = RequestMethod.POST)
- public void reportChartReceive(@RequestBody ChartJSON chartJSON, HttpServletRequest request, HttpServletResponse response) throws IOException {
- ReportRuntime reportRuntime;
- System.out.println("*****Hit RaptorChart******");
- reportRuntime = (ReportRuntime) request.getSession().getAttribute(AppConstants.SI_REPORT_RUNTIME); //changing session to request
- String reportID = request.getParameter("c_master");
- if (reportRuntime == null && AppUtils.nvl(reportID).length() > 0) {
- try {
- ReportHandler rh = new ReportHandler();
- reportRuntime = rh.loadReportRuntime(request, reportID);
- } catch (RaptorException ex) {
- ex.printStackTrace();
-
- }
- }
-
- if (reportRuntime != null) {
- String chartType = chartJSON.getChartType();
- reportRuntime.setChartType(chartJSON.getChartType());
- reportRuntime.setChartAnimate(chartJSON.isAnimation());
- reportRuntime.setChartWidth(chartJSON.getWidth());
- reportRuntime.setChartHeight(chartJSON.getHeight());
- reportRuntime.setShowChartTitle(chartJSON.isShowTitle());
-
-
- String domainAxis = null;
- domainAxis = chartJSON.getDomainAxis();
-
- List < DataColumnType > reportCols = reportRuntime.getAllColumns();
-
- for (Iterator < DataColumnType > iter = reportCols.iterator(); iter
- .hasNext();) {
- DataColumnType dct = (DataColumnType) iter.next();
- if (dct.getColId().equals(domainAxis)) {
- dct.setColOnChart(AppConstants.GC_LEGEND);
- } else {
- dct.setColOnChart(null);
- }
- }
-
- CategoryAxisJSON categoryAxisJSON = chartJSON.getCategoryAxisJSON();
- String categoryAxis = null;
-
- categoryAxis = (categoryAxisJSON!=null?categoryAxisJSON.getValue():"");
-
- reportCols = reportRuntime.getAllColumns();
-
- for (Iterator < DataColumnType > iter = reportCols.iterator(); iter
- .hasNext();) {
- DataColumnType dct = (DataColumnType) iter.next();
- if (dct.getColId().equals(categoryAxis)) {
- dct.setChartSeries(true);
- } else {
- dct.setChartSeries(false);
- }
- }
-
-
- ArrayList < RangeAxisJSON > rangeAxisList = chartJSON.getRangeAxisList();
- int r = 0;
- for (int i = 0; i < rangeAxisList.size(); i++) {
- RangeAxisJSON rangeAxisJSON = rangeAxisList.get(i);
- String rangeAxis = rangeAxisJSON.getRangeAxis();
- String rangeYAxis = AppUtils.nvl(rangeAxisJSON.getRangeYAxis());
- String rangeChartGroup = AppUtils.nvl(rangeAxisJSON.getRangeChartGroup());
- String rangeColor = AppUtils.nvl(rangeAxisJSON.getRangeColor());
- String rangeLineType = AppUtils.nvl(rangeAxisJSON.getRangeLineType());
-
- rangefor:
- for (Iterator < DataColumnType > iterator = reportCols.iterator(); iterator.hasNext();) {
- DataColumnType dct = (DataColumnType) iterator.next();
- if (dct.getColId().equals(rangeAxis)) {
- dct.setChartSeq(++r);
- dct.setColOnChart("0");
- dct.setYAxis(rangeYAxis); //+"|"+dct.getColId());
- dct.setChartGroup(rangeChartGroup); //+"|"+dct.getColId());
- dct.setChartColor(rangeColor);
- dct.setChartLineType(rangeLineType);
-
- if (chartType.equals(AppConstants.GT_ANNOTATION_CHART) || chartType.equals(AppConstants.GT_FLEX_TIME_CHARTS)) {
- if (rangeAxisJSON.isShowAsArea()) {
- dct.setIsRangeAxisFilled(true);
- } else {
- dct.setIsRangeAxisFilled(false);
- }
- }
- break rangefor;
- }
- }
-
- }
-
-
- reportRuntime.setChartLeftAxisLabel(chartJSON.getPrimaryAxisLabel());
- reportRuntime.setChartRightAxisLabel(chartJSON.getSecondaryAxisLabel());
-
- reportRuntime.setRangeAxisLowerLimit(chartJSON.getMinRange());
- reportRuntime.setRangeAxisUpperLimit(chartJSON.getMaxRange());
-
-
-
- if (chartType.equals(AppConstants.GT_ANNOTATION_CHART) || chartType.equals(AppConstants.GT_FLEX_TIME_CHARTS)) {
- if (chartJSON.getFlexTimeSeriesChartOptions() != null) {
- reportRuntime.setZoomIn(chartJSON.getFlexTimeSeriesChartOptions().getZoomIn());
- reportRuntime.setTimeAxisType(chartJSON.getFlexTimeSeriesChartOptions().getTimeAxisType());
- }
-
- }
-
- if (chartType.equals(AppConstants.GT_TIME_SERIES)) {
- if (chartJSON.getTimeSeriesChartOptions() != null) {
- reportRuntime.setTimeSeriesRender(chartJSON.getTimeSeriesChartOptions().getLineChartRenderer());
- reportRuntime.setShowXAxisLabel(chartJSON.getTimeSeriesChartOptions().isShowXAxisLabel());
- reportRuntime.setAddXAxisTickers(chartJSON.getTimeSeriesChartOptions().isAddXAxisTicker());
- reportRuntime.setTimeAxis(chartJSON.getTimeSeriesChartOptions().isNonTimeAxis());
- reportRuntime.setMultiSeries(chartJSON.getTimeSeriesChartOptions().isMultiSeries());
- }
-
- }
-
- if (chartType.equals(AppConstants.GT_BAR_3D)) {
- if (chartJSON.getBarChartOptions() != null) {
- reportRuntime.setChartOrientation(chartJSON.getBarChartOptions().isVerticalOrientation() ? "vertical" : "horizontal");
- reportRuntime.setChartStacked(chartJSON.getBarChartOptions().isStackedChart());
- reportRuntime.setBarControls(chartJSON.getBarChartOptions().isDisplayBarControls());
- reportRuntime.setXAxisDateType(chartJSON.getBarChartOptions().isxAxisDateType());
- reportRuntime.setLessXaxisTickers(chartJSON.getBarChartOptions().isMinimizeXAxisTickers());
- reportRuntime.setTimeAxis(chartJSON.getBarChartOptions().isTimeAxis());
- reportRuntime.setLogScale(chartJSON.getBarChartOptions().isyAxisLogScale());
- }
- }
-
-
- reportRuntime.setLegendLabelAngle(chartJSON.getCommonChartOptions().getLegendLabelAngle());
- reportRuntime.setChartLegendDisplay(chartJSON.getCommonChartOptions().isHideLegend() ? "Y" : "N");
- reportRuntime.setAnimateAnimatedChart(chartJSON.getCommonChartOptions().isAnimateAnimatedChart());
-
- reportRuntime.setTopMargin(chartJSON.getCommonChartOptions().getTopMargin());
- reportRuntime.setBottomMargin(chartJSON.getCommonChartOptions().getBottomMargin());
- reportRuntime.setLeftMargin(chartJSON.getCommonChartOptions().getLeftMargin());
- reportRuntime.setRightMargin(chartJSON.getCommonChartOptions().getRightMargin());
-
-
-
- for (Iterator < DataColumnType > iterator = reportCols.iterator(); iterator.hasNext();) {
- DataColumnType dct = (DataColumnType) iterator.next();
- if (!(AppUtils.nvl(dct.getColOnChart()).equals(AppConstants.GC_LEGEND) || (dct.getChartSeq()!=null && dct.getChartSeq()>0) || dct.isChartSeries()) ) {
- dct.setChartSeq(-1);
- dct.setChartColor(null);
- dct.setColOnChart(null);
- dct.setCreateInNewChart(false);
- dct.setChartGroup(null);
- dct.setYAxis(null);
- }
- }
-
-
- try {
- reportRuntime.persistLinearReport(request);
- } catch (Exception ex) {
- ex.printStackTrace();
- logger.error("While SAVING CHART", ex);
- }
- }
-
- }
-
- public String getViewName() {
- return viewName;
- }
- public void setViewName(String viewName) {
- this.viewName = viewName;
- }
-
- public String nvl(String s) {
- return (s == null) ? "" : s;
- }
-
- public String nvl(String s, String sDefault) {
- return nvl(s).equals("") ? sDefault : s;
- }
-
- EELFLoggerDelegate logger = EELFLoggerDelegate.getLogger(RaptorControllerAsync.class);
-
-
-
-}
diff --git a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/ReportsSearchListController.java b/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/ReportsSearchListController.java
deleted file mode 100644
index b5df482b..00000000
--- a/ecomp-sdk/sdk-analytics/src/main/java/org/openecomp/portalsdk/analytics/system/fusion/web/ReportsSearchListController.java
+++ /dev/null
@@ -1,74 +0,0 @@
-/*-
- * ================================================================================
- * eCOMP Portal SDK
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file 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.
- * ================================================================================
- */
-package org.openecomp.portalsdk.analytics.system.fusion.web;
-
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.openecomp.portalsdk.analytics.system.fusion.service.RaptorService;
-import org.springframework.web.servlet.ModelAndView;
-
-
-public class ReportsSearchListController {
-
- private RaptorService raptorService = null;
-
- /**
- * @return the raptorService
- */
- public RaptorService getRaptorService() {
- return raptorService;
- }
-
- /**
- * @param raptorService the raptorService to set
- */
- public void setRaptorService(RaptorService raptorService) {
- this.raptorService = raptorService;
- }
-
- public ModelAndView handleRequestInternal(HttpServletRequest request,
- HttpServletResponse response) {
-
- /*List items = null;
- int reportId = ServletRequestUtils.getIntParameter(request, "report_id", 0);
- String task = ServletRequestUtils.getStringParameter(request, "task", TASK_GET);
-
- HashMap additionalParams = new HashMap();
- additionalParams.put(Parameters.PARAM_HTTP_REQUEST, request);
-
- if (reportId != 0 && task.equals(TASK_DELETE)) { // delete the selected record
- getRaptorService().deleteReport(new Long(reportId));
- }
-
- items = getRaptorService().getReports();
-
- Map model = new HashMap();
- model.put("items", items);
-
- return new ModelAndView(getViewName(), "model", model);
- */
- //return new ModelAndView(getViewName(), "model", null);
- System.out.println("Fill with proper code");
- return null;
- }
-
-}