From 1319b1cc134630c386c088f3300b3c72d67c616c Mon Sep 17 00:00:00 2001 From: Indrijeet kumar Date: Thu, 7 May 2020 09:57:19 +0530 Subject: reduced some code smells reduced some code smells Issue-ID: PORTAL-813 Change-Id: I5de9eef7f9b4e7983a2893fe91c83226fe1903cd Signed-off-by: Indrijeet Kumar --- .../main/java/org/onap/portalsdk/analytics/xmlobj/DataSourceList.java | 3 +-- .../main/java/org/onap/portalsdk/analytics/xmlobj/FormFieldList.java | 2 +- .../src/main/java/org/onap/portalsdk/analytics/xmlobj/FormatList.java | 2 +- .../main/java/org/onap/portalsdk/analytics/xmlobj/JavascriptList.java | 2 +- .../main/java/org/onap/portalsdk/analytics/xmlobj/ObjectFactory.java | 4 ++-- .../java/org/onap/portalsdk/analytics/xmlobj/PredefinedValueList.java | 2 +- .../src/main/java/org/onap/portalsdk/analytics/xmlobj/ReportMap.java | 2 +- .../main/java/org/onap/portalsdk/analytics/xmlobj/SemaphoreList.java | 2 +- .../onap/portalapp/controller/sample/CollaborateListController.java | 2 +- .../org/onap/portalapp/controller/sample/DS2SampleController.java | 2 +- .../onap/portalsdk/core/restful/client/SharedContextRestClient.java | 4 ++-- .../src/main/java/org/onap/portalsdk/core/service/UrlAccessImpl.java | 2 +- .../java/org/onap/portalsdk/core/service/UserProfileServiceImpl.java | 2 +- 13 files changed, 15 insertions(+), 16 deletions(-) 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 http://java.sun.com/xml/jaxb // 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 getDataSource() { if (dataSource == null) { - dataSource = new ArrayList(); + 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 getFormField() { if (formField == null) { - formField = new ArrayList(); + 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 getFormat() { if (format == null) { - format = new ArrayList(); + 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 getJavascriptItem() { if (javascriptItem == null) { - javascriptItem = new ArrayList(); + 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 createCustomReport(CustomReportType value) { - return new JAXBElement(_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 createComment(String value) { - return new JAXBElement(_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 getPredefinedValue() { if (predefinedValue == null) { - predefinedValue = new ArrayList(); + 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 getMarkers() { if (markers == null) { - markers = new ArrayList(); + 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 getSemaphore() { if (semaphore == null) { - semaphore = new ArrayList(); + 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 model = new HashMap(); + Map 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 model = new HashMap(); + Map 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 restrictionsList = new ArrayList(); + List 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 restrictionsList = new ArrayList(); + List restrictionsList = new ArrayList<>(); Criterion criterion1 = Restrictions.eq("loginId", loginId); restrictionsList.add(criterion1); List users = (List) getDataAccessService().getList(User.class, null, restrictionsList, null); -- cgit 1.2.3-korg