diff options
5 files changed, 97 insertions, 98 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java index a1196808..6718e427 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/Globals.java @@ -97,11 +97,10 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { private static Scheduler scheduler = null; // System type constants - public final static String ST_FUSION = "fusion"; - public final static String ST_GENERIC = "generic"; + public static final String ST_GENERIC = "generic"; - public final static String ST_PRISMS = "prisms"; + public static final String ST_PRISMS = "prisms"; private static String systemType = ST_PRISMS; // default @@ -126,7 +125,11 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { private static String baseTitle = "ANALYSIS"; - private static String sheet_name = "Raptor Reports"; + private static String sheetName = "Raptor Reports"; + + private static final String ANALYTIC_SYSTEM = "org.onap.portalsdk.analytics.system."; + + private static final String NOT_INITIALIZED = "[SYSTEM ERROR] Globals not initialized"; private static boolean allowSQLBasedReports = true; // whether to allow // SQL-based report @@ -271,14 +274,6 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { private static String javaTimeFormat = "MM/dd/yyyy h:m:s a"; - private static String oracleTimeFormat = "%m/%d/%Y %h:%i:%s %p"; // must - // correspond - // to - // the - // java - // format - // modifier - private static String raptorVersion = "10.5.1"; private static int flatFileLowerLimit = 0; @@ -293,9 +288,9 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { private static String sessionParams = ""; - private static boolean displayAllUsers = true; + private static boolean displayAllUsers = true; - private static boolean user_col_def = true; + private static boolean userColDef = true; private static boolean printFooterInDownload = true; @@ -347,25 +342,24 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { } catch (Exception e) { logger.error(EELFLoggerDelegate.debugLogger, ("[EXCEPTION ENCOUNTERED IN RAPTOR] Globals: Unable to load properties [" + ConfigLoader.RAPTOR_PROPERTIES + "]. Exception: " + e.getMessage())); - // throw new RuntimeException(e.getMessage()); } systemInitialized = true; try { appUtils = (IAppUtils) Class.forName( - "org.onap.portalsdk.analytics.system." + systemType.toLowerCase() + ".AppUtils") + ANALYTIC_SYSTEM + systemType.toLowerCase() + ".AppUtils") .newInstance(); appUtils.initializeAppUtils(servletContext); dbUtils = (IDbUtils) Class.forName( - "org.onap.portalsdk.analytics.system." + systemType.toLowerCase() + ".DbUtils") + ANALYTIC_SYSTEM + systemType.toLowerCase() + ".DbUtils") .newInstance(); dbUtils.initializeDbUtils(servletContext); if(!Globals.getSystemType().equals(Globals.ST_GENERIC)) { rdbUtils = (RDbUtils) Class.forName( - "org.onap.portalsdk.analytics.system." + systemType.toLowerCase() + ".RemoteDbUtils") + ANALYTIC_SYSTEM + systemType.toLowerCase() + ".RemoteDbUtils") .newInstance(); rdbUtils.initializeDbUtils(servletContext); } @@ -387,35 +381,6 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { throw new RuntimeException(eMsg); } // catch - /*try { - //DataSet ds = DbUtils - // .executeQuery("SELECT 1 FROM dual WHERE EXISTS (SELECT 1 FROM cr_table_role)"); - - String p_sql = Globals.getInitializeRoles(); - DataSet ds = DbUtils.executeQuery(p_sql); - - restrictTablesByRole = (ds.getRowCount() > 0); - } catch (Exception e) { - String eMsg = "[SYSTEM ERROR] Globals: Unable to load Raptor version. Exception: " - + e.getMessage(); - debugLogger.error("[EXCEPTION ENCOUNTERED IN RAPTOR] " + eMsg, e); - } // catch - */ - /*try { - //DataSet ds = DbUtils.executeQuery("SELECT cr_raptor.get_version FROM dual"); - - //String n_sql = Globals.getInitializeVersion(); - //DataSet ds = DbUtils.executeQuery(n_sql); - //raptorVersion = Globals.get - // if(ds.getRowCount()>0) - // raptorVersion = " v"+ds.getString(0, 0); - } catch (Exception e) { - String eMsg = "[SYSTEM ERROR] Globals: Unable to load Raptor version. Exception: " - + e.getMessage(); - debugLogger.error("[EXCEPTION ENCOUNTERED IN RAPTOR] " + eMsg, e); - } // catch*/ - - //initiate pdf global config try { raptorPdfProperties = ConfigLoader.getProperties(servletContext, ConfigLoader.RAPTOR_PDF_PROPERTIES); @@ -522,9 +487,6 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { .toUpperCase().startsWith("Y"); showDescrAtRuntime = nvls(raptorProperties.getProperty("show_descr_at_runtime"), "no").toUpperCase().startsWith("Y"); - // skipChartLabelsToFit = - // nvls(raptorProperties.getProperty("skip_chart_labels_to_fit"), - // "no" ).toUpperCase().startsWith("Y"); showNonstandardCharts = nvls( raptorProperties.getProperty("show_nonstandard_charts"), "no") .toUpperCase().startsWith("Y"); @@ -539,21 +501,13 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { displayChartByDefault = nvls( raptorProperties.getProperty("display_chart_by_default"), "yes") .toUpperCase().startsWith("Y"); - //System.out.println("Params Globals " + raptorProperties.getProperty("print_params_in_download")); printParamsInDownload = nvls( raptorProperties.getProperty("print_params_in_download"), "no") .toUpperCase().startsWith("Y"); - //System.out.println("printParamsInDownload " + printParamsInDownload); canCopyOnReadOnly = nvls(raptorProperties.getProperty("can_copy_on_read_only"), "yes").toUpperCase().startsWith("Y"); - // chartLinesAlwaysSolid = - // nvls(raptorProperties.getProperty("chart_lines_always_solid"), - // "yes").toUpperCase().startsWith("Y"); - // chartLinesAlwaysSmooth = - // nvls(raptorProperties.getProperty("chart_lines_always_smooth"), - // "yes").toUpperCase().startsWith("Y"); displayAllUsers = nvls( raptorProperties.getProperty("display_all_users"), "yes") .toUpperCase().startsWith("Y"); @@ -561,10 +515,10 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { raptorProperties.getProperty("request_get_params"), ""); sessionParams = nvls( raptorProperties.getProperty("session_params"), ""); - user_col_def = nvls( + userColDef = nvls( raptorProperties.getProperty("user_col_def"), "no") .toUpperCase().startsWith("Y"); - sheet_name = nvls(raptorProperties.getProperty("sheet_name"), "Raptor Reports"); + sheetName = nvls(raptorProperties.getProperty("sheet_name"), "Raptor Reports"); try { flatFileLowerLimit = Integer.parseInt(raptorProperties .getProperty("flat_file_lower_limit")); @@ -576,7 +530,6 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { } catch (NumberFormatException nfe) { } shellScriptDir = nvls(raptorProperties.getProperty("shell_script_dir"), ""); - //queryFolder = nvls(raptorProperties.getProperty("download_query_folder"), AppUtils.getTempFolderPath()+"../raptor/dwnld/query/"); queryFolder = nvls(raptorProperties.getProperty("download_query_folder"),"../raptor/dwnld/query/"); @@ -604,35 +557,35 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { public static ActionMapping getRaptorActionMapping() { if (!systemInitialized) - throw new RuntimeException("[SYSTEM ERROR] Globals not initialized"); + throw new IllegalStateException(NOT_INITIALIZED); return raptorActionMapping; } // getRaptorActionMapping public static String getSystemType() { if (!systemInitialized) - throw new RuntimeException("[SYSTEM ERROR] Globals not initialized"); + throw new IllegalStateException(NOT_INITIALIZED); return systemType; } // getSystemType public static IAppUtils getAppUtils() { if (!systemInitialized) - throw new RuntimeException("[SYSTEM ERROR] Globals not initialized"); + throw new IllegalStateException(NOT_INITIALIZED); return appUtils; } // getAppUtils public static IDbUtils getDbUtils() { if (!systemInitialized) - throw new RuntimeException("[SYSTEM ERROR] Globals not initialized"); + throw new IllegalStateException(NOT_INITIALIZED); return dbUtils; } // getDbUtils public static RDbUtils getRDbUtils() { if (!systemInitialized) - throw new RuntimeException("[SYSTEM ERROR] Globals not initialized"); + throw new IllegalStateException(NOT_INITIALIZED); return rdbUtils; } // getDbUtils @@ -647,7 +600,8 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { } public static int getCSVDownloadLimit() { - return Integer.parseInt(nvls(raptorProperties.getProperty("csv_download_limit"), new Integer(getDownloadLimit()).toString()).trim()); + return Integer.parseInt(nvls(raptorProperties.getProperty("csv_download_limit"), + Integer.toString(getDownloadLimit()))); } public static String getDownloadLimitAsText() { @@ -723,8 +677,6 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { return showDescrAtRuntime; } - // public static boolean getSkipChartLabelsToFit() { return - // skipChartLabelsToFit; } public static boolean getShowNonstandardCharts() { return showNonstandardCharts; } @@ -753,10 +705,6 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { return canCopyOnReadOnly; } - // public static boolean getChartLinesAlwaysSolid() { return - // chartLinesAlwaysSolid; } - // public static boolean getChartLinesAlwaysSmooth() { return - // chartLinesAlwaysSmooth; } public static int getMaxDecimalsOnTotals() { return maxDecimalsOnTotals; } @@ -781,11 +729,6 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { return javaTimeFormat; } -/* public static String getOracleTimeFormat() { - return oracleTimeFormat; - } -*/ - public static String getRaptorVersion() { return raptorVersion; } @@ -794,13 +737,13 @@ public class Globals extends org.onap.portalsdk.analytics.RaptorObject { return displayAllUsers; } - public static boolean getUserColDef() { - return user_col_def; - } - - public static String getSheetName() { - return sheet_name; - } + public static boolean getUserColDef() { + return userColDef; + } + + public static String getSheetName() { +return sheetName; +} public static int getFlatFileLowerLimit() { return flatFileLowerLimit; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/RaptorAdapter.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/RaptorAdapter.java index fc5fdb36..c934f8d4 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/RaptorAdapter.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/system/fusion/adapter/RaptorAdapter.java @@ -76,6 +76,7 @@ public class RaptorAdapter extends FusionAdapter { public static final int RAPTOR_USER_ID = 20000; // RAPTOR system user id (for auditing purposes) public static final String RAPTOR_CONTROLLER_CLASSNAME = "org.onap.portalsdk.analytics.controller.Controller"; public static final String KEY_USER_ROLES_CACHE = "userRoles"; + private static final String USER_ID = "user_id"; public void initializeRaptor() { org.onap.portalsdk.analytics.config.ConfigLoader.setConfigFilesPath(SystemProperties.getProperty(SystemProperties.RAPTOR_CONFIG_FILE_PATH)); @@ -86,7 +87,6 @@ public class RaptorAdapter extends FusionAdapter { /** 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) { @@ -95,7 +95,9 @@ public class RaptorAdapter extends FusionAdapter { public static String getUserBackdoorLoginId(HttpServletRequest request) { - if(AppUtils.getRequestNvlValue(request, "login_id").length()>0) return AppUtils.getRequestNvlValue(request, "login_id"); + if (AppUtils.getRequestNvlValue(request, "login_id").length() > 0) { + return AppUtils.getRequestNvlValue(request, "login_id"); + } return String.valueOf(UserUtils.getUserSession(request).getLoginId()); } @@ -106,19 +108,17 @@ public class RaptorAdapter extends FusionAdapter { /** 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)); + params.put(USER_ID, new Long(userId)); List list = getDataAccessService().executeNamedQuery("getUserNameById", params, null); String firstName = ""; String lastName = ""; - if (list != null) { - if (!list.isEmpty()) { + if (list != null && !list.isEmpty()) { Object[] user = (Object[]) list.get(0); firstName = (String) user[0]; // firstName scalar lastName = (String) user[1]; // lastName scalar - } } return lastName + ", " + firstName; @@ -131,7 +131,7 @@ public class RaptorAdapter extends FusionAdapter { public static String getUserEmail(String userId) { Map<String, Long> params = new HashMap<String, Long>(); - params.put("user_id", new Long(userId)); + params.put(USER_ID, new Long(userId)); List list = getDataAccessService().executeNamedQuery("getUserEmail", params, null); String email = ""; if (list != null && !list.isEmpty()) @@ -148,8 +148,8 @@ public class RaptorAdapter extends FusionAdapter { String loginId = ""; try{ - List<Criterion> restrictionsList = new ArrayList<Criterion>(); - Criterion criterion1 = Restrictions.eq("user_id", userId); + List<Criterion> restrictionsList = new ArrayList<>(); + Criterion criterion1 = Restrictions.eq(USER_ID, userId); restrictionsList.add(criterion1); List list = getDataAccessService().getList(User.class, null, restrictionsList, null); if (list != null) { @@ -173,7 +173,7 @@ public class RaptorAdapter extends FusionAdapter { /** 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>(); + Map<Long, String> map = new LinkedHashMap<>(); if(customizedQuery.length()>0 && !isAdmin) { diff --git a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_0_OS.sql b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_0_OS.sql index 685d1784..a397f2d0 100644 --- a/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_0_OS.sql +++ b/ecomp-sdk/epsdk-app-os/db-scripts/EcompSdkDMLMySql_3_0_OS.sql @@ -36,4 +36,60 @@ Insert into fn_app (APP_ID,APP_NAME,APP_IMAGE_URL,APP_DESCRIPTION,APP_NOTES,APP_ -- fn_user_role Insert into fn_user_role (USER_ID,ROLE_ID,PRIORITY,APP_ID) values (1,1,null,1); +INSERT INTO CR_REPORT(REP_ID, TITLE, DESCR, PUBLIC_YN, REPORT_XML, CREATE_ID, CREATE_DATE, MAINT_ID, MAINT_DATE, MENU_ID, MENU_APPROVED_YN, OWNER_ID, FOLDER_ID, DASHBOARD_TYPE_YN, DASHBOARD_YN) VALUES +(1, 'test report', 'test report', 'Y', '<?xml version="1.0" encoding="UTF-8" standalone="yes"?> +<customReport pageSize="50" reportType="Linear"> + <reportName>test report</reportName> + <reportDescr>test report</reportDescr> + <dbInfo>local</dbInfo> + <chartType></chartType> + <showChartTitle>false</showChartTitle> + <public>false</public> + <hideFormFieldAfterRun>false</hideFormFieldAfterRun> + <createId>1</createId> + <createDate>2019-09-11-04:00</createDate> + <reportSQL>SELECT + first_name fi1 +from fn_user</reportSQL> + <frozenColumns>0</frozenColumns> + <emptyMessage>Your Search didn''t yield any results.</emptyMessage> + <dataGridAlign>left</dataGridAlign> + <numFormCols>100</numFormCols> + <displayOptions>NNNNNNN</displayOptions> + <allowSchedule>N</allowSchedule> + <sizedByContent>N</sizedByContent> + <comment>N|</comment> + <dataSourceList> + <dataSource tableId="du0"> + <tableName>DUAL</tableName> + <tablePK></tablePK> + <displayName>DUAL</displayName> + <dataColumnList> + <dataColumn colId="fi1"> + <tableId>du0</tableId> + <dbColName>first_name</dbColName> + <colName>first_name</colName> + <displayName>first_name</displayName> + <displayWidth>10</displayWidth> + <displayAlignment>Left</displayAlignment> + <orderSeq>1</orderSeq> + <visible>true</visible> + <calculated>true</calculated> + <colType>VARCHAR2</colType> + <groupBreak>false</groupBreak> + <dbColType>VARCHAR2</dbColType> + </dataColumn> + </dataColumnList> + </dataSource> + </dataSourceList> + <maxRowsInExcelDownload>500</maxRowsInExcelDownload> + <isOneTimeScheduleAllowed>N</isOneTimeScheduleAllowed> + <isHourlyScheduleAllowed>N</isHourlyScheduleAllowed> + <isDailyScheduleAllowed>N</isDailyScheduleAllowed> + <isDailyMFScheduleAllowed>N</isDailyMFScheduleAllowed> + <isWeeklyScheduleAllowed>N</isWeeklyScheduleAllowed> + <isMonthlyScheduleAllowed>N</isMonthlyScheduleAllowed> +</customReport>', 1, sysdate(), 1, sysdate(), 'HOME', 'N', 1, NULL, 'N', 'N'); + + commit;
\ No newline at end of file diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java index 2336a514..a5a2b2ba 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/crossapi/CadiAuthFilter.java @@ -79,8 +79,8 @@ public class CadiAuthFilter extends CadiFilter { throw new ServletException("Filter init parameter " + INCLUDE_URL_ENDPOINTS + " is null or empty"); if (exclude_url_endpoints == null || exclude_url_endpoints.isEmpty()) throw new ServletException("Filter init parameter " + EXCLUDE_URL_ENDPOINTS + " is null or empty"); - includeUrlEndPointList = new ArrayList<String>(Arrays.asList(include_url_endpoints.split(","))); - excludeUrlEndPointList = new ArrayList<String>(Arrays.asList(exclude_url_endpoints.split(","))); + includeUrlEndPointList = new ArrayList<>(Arrays.asList(include_url_endpoints.split(","))); + excludeUrlEndPointList = new ArrayList<>(Arrays.asList(exclude_url_endpoints.split(","))); } @Override diff --git a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java index ac310805..2e47768a 100644 --- a/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java +++ b/ecomp-sdk/epsdk-fw/src/main/java/org/onap/portalsdk/core/onboarding/util/AuthUtil.java @@ -204,7 +204,7 @@ public class AuthUtil { logger.debug("Request is Authorized"); } } catch (ClassCastException e) { - logger.warn("Given request is not CADI request: " + e.toString()); + logger.warn("Given request is not CADI request: ", e); if (appCredentials.isEmpty()) { logger.debug("app credentails are empty"); |