diff options
22 files changed, 28 insertions, 77 deletions
diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameList.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameList.java index 8f44e37b..154c94b4 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameList.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameList.java @@ -176,20 +176,6 @@ public class IdNameList extends Vector { public void loadData(String pageNo, String searchString, String dbInfo) throws RaptorException {} private void loadData(int pageNo, String searchString, String dbInfo) throws RaptorException {} -/* - public void loadData(int pageNo, String dbInfo) throws RaptorException { - } - - public void loadUserData(int pageNo, String dbInfo, String userId) throws RaptorException { - } - - - - - public void loadData(String pageNo, String searchString) throws RaptorException { - } - -*/ protected static String nvl(String s) { return (s == null) ? "" : s; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameLookup.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameLookup.java index f2a15f43..590fd1aa 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameLookup.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/model/base/IdNameLookup.java @@ -60,29 +60,6 @@ public class IdNameLookup extends IdNameSql { this(dbTableName, dbIdField, dbNameField, null, "", false); } // IdNameLookup -/* public IdNameLookup(String dbTableName, String dbIdField, String dbNameField, - String dbSortByField) { - super(); - - setDbTableName(dbTableName); - setDbIdField(dbIdField); - setDbNameField(dbNameField); - setDbSortByField(dbSortByField); - updateParentSQL(); - } // IdNameLookup - - public IdNameLookup(String dbTableName, String dbIdField, String dbNameField, - String dbSortByField, String defaultSQL) { - super(); - - setDbTableName(dbTableName); - setDbIdField(dbIdField); - setDbNameField(dbNameField); - setDbSortByField(dbSortByField); - setDefaultSQL(defaultSQL); - updateParentSQL(); - } // IdNameLookup -*/ public IdNameLookup(String dbTableName, String dbIdField, String dbNameField, String dbSortByField, boolean textField) { super(); @@ -153,10 +130,6 @@ public class IdNameLookup extends IdNameSql { dbSortByField.indexOf(' ')) : dbSortByField) + " sort"; setSqlNoOrderBy(sql_start + sql_middle + sql_end); -// System.out.println("SQL Start " + sql_start); -// System.out.println("SQL Middle " + sql_middle); -// System.out.println("SQL End " + sql_end); -// System.out.println("DbSortByField " + dbSortByField); setSql(sql_start + sql_middle + sql_end + " ORDER BY " + nvl(dbSortByField, "2")); } // updateParentSQL @@ -173,16 +146,6 @@ public class IdNameLookup extends IdNameSql { return "SELECT " + dbIdField + " FROM " + dbTableName; } // getBaseSQL - /* - public void loadData(int pageNo) throws RaptorException { - loadData(pageNo, ""); - } // loadData - - public void loadData(String pageNo) throws RaptorException { - loadData(pageNo, ""); - } // loadData -*/ - public void loadData(String pageNo, String searchString, String dbInfo) throws RaptorException { int iPageNo = 0; diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/Utils.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/Utils.java index 416fbab7..16d6a899 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/Utils.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/util/Utils.java @@ -246,7 +246,7 @@ public class Utils extends org.onap.portalsdk.analytics.RaptorObject { Vector allUsers = AppUtils.getAllUsers(query,param, isAdmin); Vector result = new Vector(allUsers.size()); - List<Item> resultLatest = new ArrayList<Item>(); + List<Item> resultLatest = new ArrayList<>(); for (Iterator iter = allUsers.iterator(); iter.hasNext();) { IdNameValue value = (IdNameValue) iter.next(); @@ -282,7 +282,7 @@ public class Utils extends org.onap.portalsdk.analytics.RaptorObject { Vector allRoles = AppUtils.getAllRoles(query, param, isAdmin); Vector result = new Vector(allRoles.size()); - List<Item> resultLatest = new ArrayList<Item>(); + List<Item> resultLatest = new ArrayList<>(); for (Iterator iter = allRoles.iterator(); iter.hasNext();) { IdNameValue value = (IdNameValue) iter.next(); @@ -357,11 +357,14 @@ public class Utils extends org.onap.portalsdk.analytics.RaptorObject { int numberOfTimesLooped = 0; boolean isSorted = false; SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); - Date date1 = null, date2 = null; + Date date1 = null; + Date date2 = null; Date currDate = new Date(); Object[] matchingfileNamesArr = matchingFiles.toArray(); //System.out.println("SIZE " + matchingFiles.size()); - String fileName1 = "", fileName2 =""; + String fileName1 = ""; + String fileName2 =""; + do { isSorted = true; for (int j = 1; j < matchingfileNamesArr.length - numberOfTimesLooped++; j++) { diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ChartDrillOptions.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ChartDrillOptions.java index de8593a8..dfe91132 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ChartDrillOptions.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ChartDrillOptions.java @@ -217,7 +217,7 @@ public class ChartDrillOptions { */ public List<ChartDrillFormfield> getTargetFormfield() { if (targetFormfield == null) { - targetFormfield = new ArrayList<ChartDrillFormfield>(); + targetFormfield = new ArrayList<>(); } return this.targetFormfield; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ColFilterList.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ColFilterList.java index 6a56d590..18cb0075 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ColFilterList.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ColFilterList.java @@ -104,7 +104,7 @@ public class ColFilterList { */ public List<ColFilterType> getColFilter() { if (colFilter == null) { - colFilter = new ArrayList<ColFilterType>(); + colFilter = new ArrayList<>(); } return this.colFilter; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DashboardEditorList.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DashboardEditorList.java index b2b105f5..577b896c 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DashboardEditorList.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DashboardEditorList.java @@ -104,7 +104,7 @@ public class DashboardEditorList { */ public List<DashboardEditorReport> getEditorList() { if (editorList == null) { - editorList = new ArrayList<DashboardEditorReport>(); + editorList = new ArrayList<>(); } return this.editorList; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DashboardReports.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DashboardReports.java index b4ef7389..8f1f1d2f 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DashboardReports.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DashboardReports.java @@ -104,7 +104,7 @@ public class DashboardReports { */ public List<Reports> getReportsList() { if (reportsList == null) { - reportsList = new ArrayList<Reports>(); + reportsList = new ArrayList<>(); } return this.reportsList; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DashboardReportsNew.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DashboardReportsNew.java index 3eadf6f5..849aa651 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DashboardReportsNew.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DashboardReportsNew.java @@ -110,7 +110,7 @@ public class DashboardReportsNew { */ public List<Reports> getReportsList() { if (reportsList == null) { - reportsList = new ArrayList<Reports>(); + reportsList = new ArrayList<>(); } return this.reportsList; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DataColumnList.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DataColumnList.java index dffce0e9..4d9ba5d9 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DataColumnList.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DataColumnList.java @@ -106,7 +106,7 @@ public class DataColumnList { */ public List<DataColumnType> getDataColumn() { if (dataColumn == null) { - dataColumn = new ArrayList<DataColumnType>(); + dataColumn = new ArrayList<>(); } return this.dataColumn; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DataSourceList.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DataSourceList.java index 86f2d9cc..ac69dbd2 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DataSourceList.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/DataSourceList.java @@ -40,7 +40,6 @@ // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. // Generated on: 2016.06.07 at 02:07:29 PM EDT -// package org.onap.portalsdk.analytics.xmlobj; @@ -104,7 +103,7 @@ public class DataSourceList { */ public List<DataSourceType> getDataSource() { if (dataSource == null) { - dataSource = new ArrayList<DataSourceType>(); + dataSource = new ArrayList<>(); } return this.dataSource; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/FormFieldList.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/FormFieldList.java index 9ddba794..817075d3 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/FormFieldList.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/FormFieldList.java @@ -107,7 +107,7 @@ public class FormFieldList { */ public List<FormFieldType> getFormField() { if (formField == null) { - formField = new ArrayList<FormFieldType>(); + formField = new ArrayList<>(); } return this.formField; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/FormatList.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/FormatList.java index 129f500a..d403798d 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/FormatList.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/FormatList.java @@ -106,7 +106,7 @@ public class FormatList { */ public List<FormatType> getFormat() { if (format == null) { - format = new ArrayList<FormatType>(); + format = new ArrayList<>(); } return this.format; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/JavascriptList.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/JavascriptList.java index d2c04119..18d06675 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/JavascriptList.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/JavascriptList.java @@ -110,7 +110,7 @@ public class JavascriptList { */ public List<JavascriptItemType> getJavascriptItem() { if (javascriptItem == null) { - javascriptItem = new ArrayList<JavascriptItemType>(); + javascriptItem = new ArrayList<>(); } return this.javascriptItem; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ObjectFactory.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ObjectFactory.java index 189b44b3..647afdb2 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ObjectFactory.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ObjectFactory.java @@ -308,7 +308,7 @@ public class ObjectFactory { */ @XmlElementDecl(namespace = "", name = "customReport") public JAXBElement<CustomReportType> createCustomReport(CustomReportType value) { - return new JAXBElement<CustomReportType>(_CustomReport_QNAME, CustomReportType.class, null, value); + return new JAXBElement<>(_CustomReport_QNAME, CustomReportType.class, null, value); } /** @@ -317,7 +317,7 @@ public class ObjectFactory { */ @XmlElementDecl(namespace = "", name = "comment") public JAXBElement<String> createComment(String value) { - return new JAXBElement<String>(_Comment_QNAME, String.class, null, value); + return new JAXBElement<>(_Comment_QNAME, String.class, null, value); } } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/PredefinedValueList.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/PredefinedValueList.java index 29baaf68..0752cab8 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/PredefinedValueList.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/PredefinedValueList.java @@ -104,7 +104,7 @@ public class PredefinedValueList { */ public List<String> getPredefinedValue() { if (predefinedValue == null) { - predefinedValue = new ArrayList<String>(); + predefinedValue = new ArrayList<>(); } return this.predefinedValue; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ReportMap.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ReportMap.java index d0ce8781..e4d42437 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ReportMap.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/ReportMap.java @@ -455,7 +455,7 @@ public class ReportMap { */ public List<Marker> getMarkers() { if (markers == null) { - markers = new ArrayList<Marker>(); + markers = new ArrayList<>(); } return this.markers; } diff --git a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/SemaphoreList.java b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/SemaphoreList.java index 41930939..dc1d6b8a 100644 --- a/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/SemaphoreList.java +++ b/ecomp-sdk/epsdk-analytics/src/main/java/org/onap/portalsdk/analytics/xmlobj/SemaphoreList.java @@ -104,7 +104,7 @@ public class SemaphoreList { */ public List<SemaphoreType> getSemaphore() { if (semaphore == null) { - semaphore = new ArrayList<SemaphoreType>(); + semaphore = new ArrayList<>(); } return this.semaphore; } diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborateListController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborateListController.java index a133a15d..e2515256 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborateListController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/CollaborateListController.java @@ -70,7 +70,7 @@ public class CollaborateListController extends RestrictedBaseController { @RequestMapping(value = {"/collaborate_list" }, method = RequestMethod.GET) public ModelAndView ProfileSearch(HttpServletRequest request) { - Map<String, Object> model = new HashMap<String, Object>(); + Map<String, Object> model = new HashMap<>(); ObjectMapper mapper = new ObjectMapper(); User user = UserUtils.getUserSession(request); diff --git a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/DS2SampleController.java b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/DS2SampleController.java index 4a278017..58eda311 100644 --- a/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/DS2SampleController.java +++ b/ecomp-sdk/epsdk-app-common/src/main/java/org/onap/portalapp/controller/sample/DS2SampleController.java @@ -65,7 +65,7 @@ public class DS2SampleController extends UnRestrictedBaseController { @RequestMapping(value = { "/ds2_sample" }, method = RequestMethod.GET) public ModelAndView ProfileSearch(HttpServletRequest request) { - Map<String, Object> model = new HashMap<String, Object>(); + Map<String, Object> model = new HashMap<>(); return new ModelAndView("ds2_sample", "model", model); } diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/restful/client/SharedContextRestClient.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/restful/client/SharedContextRestClient.java index 17ac9e16..6c06cc01 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/restful/client/SharedContextRestClient.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/restful/client/SharedContextRestClient.java @@ -89,8 +89,8 @@ public class SharedContextRestClient extends PortalRestClientBase { String restUrl = PortalApiProperties.getProperty(PortalApiConstants.ECOMP_REST_URL); if (restUrl == null || restUrl.length() == 0) throw new IllegalArgumentException("getSharedContextUrl: no property " + PortalApiConstants.ECOMP_REST_URL); - String contextUrl = restUrl + (restUrl.endsWith("/") ? "" : "/") + "context/"; - return contextUrl; + + return restUrl + (restUrl.endsWith("/") ? "" : "/") + "context/"; } /** diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UrlAccessImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UrlAccessImpl.java index 6965165a..ab4c36cf 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UrlAccessImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UrlAccessImpl.java @@ -98,7 +98,7 @@ public class UrlAccessImpl implements UrlAccessService { if (currentFirstUrl != null) { - List<Criterion> restrictionsList = new ArrayList<Criterion>(); + List<Criterion> restrictionsList = new ArrayList<>(); Criterion criterion1 = Restrictions.like("urlsAccessibleKey.url", currentFirstUrl + "%"); restrictionsList.add(criterion1); list = dataAccessService.getList(UrlsAccessible.class, null, restrictionsList, null); diff --git a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileServiceImpl.java b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileServiceImpl.java index caa8d2ae..879a11de 100644 --- a/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileServiceImpl.java +++ b/ecomp-sdk/epsdk-core/src/main/java/org/onap/portalsdk/core/service/UserProfileServiceImpl.java @@ -69,7 +69,7 @@ public class UserProfileServiceImpl implements UserProfileService { @SuppressWarnings("unchecked") public User getUserByLoginId(String loginId) { User user = null; - List<Criterion> restrictionsList = new ArrayList<Criterion>(); + List<Criterion> restrictionsList = new ArrayList<>(); Criterion criterion1 = Restrictions.eq("loginId", loginId); restrictionsList.add(criterion1); List<User> users = (List<User>) getDataAccessService().getList(User.class, null, restrictionsList, null); |