From fc82c51d2a399813bfb55ede8ab341400dfce03a Mon Sep 17 00:00:00 2001 From: "Salma, Attaran" Date: Tue, 6 Feb 2018 15:31:16 -0500 Subject: Cleaning code Change-Id: Idc82bf8f84a0b6268ae10ea12d1bec670509a58a Signed-off-by: Salma, Attaran Issue-ID: AAI-733 --- .../aai/sparky/analytics/AbstractStatistics.java | 1 - .../sparky/inventory/entity/GeoIndexDocument.java | 1 - .../inventory/entity/TopographicalEntity.java | 1 - .../filters/config/FiltersDetailsConfig.java | 5 +- .../filters/config/FiltersForViewsConfig.java | 4 +- .../search/filters/config/UiFilterConfig.java | 2 +- .../filters/config/UiFilterDataSourceConfig.java | 2 +- .../filters/config/UiFilterListItemConfig.java | 61 +++++++++++----------- .../config/UiFilterOptionsValuesConfig.java | 2 +- .../filters/config/UiViewListItemConfig.java | 2 +- .../security/portal/PortalRestAPIServiceImpl.java | 14 ----- .../java/org/onap/aai/sparky/util/NodeUtils.java | 4 +- .../viewandinspect/entity/ActiveInventoryNode.java | 4 +- 13 files changed, 42 insertions(+), 61 deletions(-) (limited to 'src/main') diff --git a/src/main/java/org/onap/aai/sparky/analytics/AbstractStatistics.java b/src/main/java/org/onap/aai/sparky/analytics/AbstractStatistics.java index 2dd7d93..c753d3b 100644 --- a/src/main/java/org/onap/aai/sparky/analytics/AbstractStatistics.java +++ b/src/main/java/org/onap/aai/sparky/analytics/AbstractStatistics.java @@ -49,7 +49,6 @@ public class AbstractStatistics implements ComponentStatistics { * sync-lock the creation of counters during initialization, but run time should not use lock * synchronization, only thread safe types * - * @see com.att.ecomp.uicommon.resolver.stat.ComponentStatistics#addCounter(java.lang.String) */ @Override public synchronized void addCounter(String key) { diff --git a/src/main/java/org/onap/aai/sparky/inventory/entity/GeoIndexDocument.java b/src/main/java/org/onap/aai/sparky/inventory/entity/GeoIndexDocument.java index 383172a..241cb8c 100644 --- a/src/main/java/org/onap/aai/sparky/inventory/entity/GeoIndexDocument.java +++ b/src/main/java/org/onap/aai/sparky/inventory/entity/GeoIndexDocument.java @@ -162,7 +162,6 @@ public class GeoIndexDocument implements Serializable, IndexDocument { /* * (non-Javadoc) * - * @see com.att.queryrouter.dao.DocumentStoreDataEntity#getAsJson() */ @Override diff --git a/src/main/java/org/onap/aai/sparky/inventory/entity/TopographicalEntity.java b/src/main/java/org/onap/aai/sparky/inventory/entity/TopographicalEntity.java index 5467238..aacc009 100644 --- a/src/main/java/org/onap/aai/sparky/inventory/entity/TopographicalEntity.java +++ b/src/main/java/org/onap/aai/sparky/inventory/entity/TopographicalEntity.java @@ -131,7 +131,6 @@ public class TopographicalEntity implements Serializable { /* * (non-Javadoc) * - * @see com.att.queryrouter.dao.DocumentStoreDataEntity#getAsJson() */ public String getAsJson() throws IOException { diff --git a/src/main/java/org/onap/aai/sparky/search/filters/config/FiltersDetailsConfig.java b/src/main/java/org/onap/aai/sparky/search/filters/config/FiltersDetailsConfig.java index 09eec02..80fe3fe 100644 --- a/src/main/java/org/onap/aai/sparky/search/filters/config/FiltersDetailsConfig.java +++ b/src/main/java/org/onap/aai/sparky/search/filters/config/FiltersDetailsConfig.java @@ -25,8 +25,9 @@ package org.onap.aai.sparky.search.filters.config; import java.util.ArrayList; import java.util.List; -import com.att.aft.dme2.internal.jackson.annotate.JsonCreator; -import com.att.aft.dme2.internal.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; + public class FiltersDetailsConfig { @JsonProperty("filters") diff --git a/src/main/java/org/onap/aai/sparky/search/filters/config/FiltersForViewsConfig.java b/src/main/java/org/onap/aai/sparky/search/filters/config/FiltersForViewsConfig.java index 7340758..07aea31 100644 --- a/src/main/java/org/onap/aai/sparky/search/filters/config/FiltersForViewsConfig.java +++ b/src/main/java/org/onap/aai/sparky/search/filters/config/FiltersForViewsConfig.java @@ -25,8 +25,8 @@ package org.onap.aai.sparky.search.filters.config; import java.util.ArrayList; import java.util.List; -import com.att.aft.dme2.internal.jackson.annotate.JsonCreator; -import com.att.aft.dme2.internal.jackson.annotate.JsonProperty; +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; public class FiltersForViewsConfig { diff --git a/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterConfig.java b/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterConfig.java index c566565..94f6d97 100644 --- a/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterConfig.java +++ b/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterConfig.java @@ -24,7 +24,7 @@ package org.onap.aai.sparky.search.filters.config; import java.util.List; -import com.att.aft.dme2.internal.jackson.annotate.JsonCreator; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterDataSourceConfig.java b/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterDataSourceConfig.java index be0603b..be600b0 100644 --- a/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterDataSourceConfig.java +++ b/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterDataSourceConfig.java @@ -22,7 +22,7 @@ */ package org.onap.aai.sparky.search.filters.config; -import com.att.aft.dme2.internal.jackson.annotate.JsonCreator; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterListItemConfig.java b/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterListItemConfig.java index c1ee089..2dfc894 100644 --- a/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterListItemConfig.java +++ b/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterListItemConfig.java @@ -22,48 +22,47 @@ */ package org.onap.aai.sparky.search.filters.config; -import com.att.aft.dme2.internal.jackson.annotate.JsonCreator; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; @JsonInclude(Include.NON_NULL) public class UiFilterListItemConfig { - @JsonProperty("filterId") - private String filterId; - - @JsonProperty("defaultValue") - private UiFilterOptionsValuesConfig defaultValue; - + @JsonProperty("filterId") + private String filterId; - @JsonCreator - public UiFilterListItemConfig(@JsonProperty("filterId") final String filterId, @JsonProperty("defaultValue") final UiFilterOptionsValuesConfig defaultValue) { - this.filterId = filterId; - this.defaultValue = defaultValue; - } + @JsonProperty("defaultValue") + private UiFilterOptionsValuesConfig defaultValue; - @JsonProperty("filterId") - public String getFilterId() { - return filterId; - } + @JsonCreator + public UiFilterListItemConfig(@JsonProperty("filterId") final String filterId, + @JsonProperty("defaultValue") final UiFilterOptionsValuesConfig defaultValue) { + this.filterId = filterId; + this.defaultValue = defaultValue; + } - public void setFilterId(String filterId) { - this.filterId = filterId; - } + @JsonProperty("filterId") + public String getFilterId() { + return filterId; + } - @JsonProperty("defaultValue") - public UiFilterOptionsValuesConfig getDefaultValue() { - return defaultValue; - } + public void setFilterId(String filterId) { + this.filterId = filterId; + } - public void setDefaultValue(UiFilterOptionsValuesConfig defaultValue) { - this.defaultValue = defaultValue; - } + @JsonProperty("defaultValue") + public UiFilterOptionsValuesConfig getDefaultValue() { + return defaultValue; + } - @Override - public String toString() { - return "FilterListItemEntity [filterId=" + filterId + ", defaultValue=" + defaultValue + "]"; - } + public void setDefaultValue(UiFilterOptionsValuesConfig defaultValue) { + this.defaultValue = defaultValue; + } + + @Override + public String toString() { + return "FilterListItemEntity [filterId=" + filterId + ", defaultValue=" + defaultValue + "]"; + } - } diff --git a/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterOptionsValuesConfig.java b/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterOptionsValuesConfig.java index 2abdfdd..38b8bc8 100644 --- a/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterOptionsValuesConfig.java +++ b/src/main/java/org/onap/aai/sparky/search/filters/config/UiFilterOptionsValuesConfig.java @@ -22,7 +22,7 @@ */ package org.onap.aai.sparky.search.filters.config; -import com.att.aft.dme2.internal.jackson.annotate.JsonCreator; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude.Include; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/org/onap/aai/sparky/search/filters/config/UiViewListItemConfig.java b/src/main/java/org/onap/aai/sparky/search/filters/config/UiViewListItemConfig.java index 3707417..210039c 100644 --- a/src/main/java/org/onap/aai/sparky/search/filters/config/UiViewListItemConfig.java +++ b/src/main/java/org/onap/aai/sparky/search/filters/config/UiViewListItemConfig.java @@ -25,7 +25,7 @@ package org.onap.aai.sparky.search.filters.config; import java.util.ArrayList; import java.util.List; -import com.att.aft.dme2.internal.jackson.annotate.JsonCreator; +import com.fasterxml.jackson.annotation.JsonCreator; import com.fasterxml.jackson.annotation.JsonProperty; public class UiViewListItemConfig { diff --git a/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java b/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java index 3bfc7ea..9728922 100644 --- a/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java +++ b/src/main/java/org/onap/aai/sparky/security/portal/PortalRestAPIServiceImpl.java @@ -64,9 +64,6 @@ public class PortalRestAPIServiceImpl implements IPortalRestAPIService { /* * (non-Javadoc) * - * @see - * com.att.fusion.core.onboarding.crossapi.IPortalRestAPIService#pushUser(com.att.fusion.core. - * restful.domain.EcompUser) */ @Override public void pushUser(EcompUser user) throws PortalAPIException { @@ -91,8 +88,6 @@ public class PortalRestAPIServiceImpl implements IPortalRestAPIService { /* * (non-Javadoc) * - * @see com.att.fusion.core.onboarding.crossapi.IPortalRestAPIService#editUser(java.lang.String, - * com.att.fusion.core.restful.domain.EcompUser) */ @Override public void editUser(String loginId, EcompUser user) throws PortalAPIException { @@ -116,7 +111,6 @@ public class PortalRestAPIServiceImpl implements IPortalRestAPIService { /* * (non-Javadoc) * - * @see com.att.fusion.core.onboarding.crossapi.IPortalRestAPIService#getUser(java.lang.String) */ @Override public EcompUser getUser(String loginId) throws PortalAPIException { @@ -131,7 +125,6 @@ public class PortalRestAPIServiceImpl implements IPortalRestAPIService { /* * (non-Javadoc) * - * @see com.att.fusion.core.onboarding.crossapi.IPortalRestAPIService#getUsers() */ @Override public List getUsers() throws PortalAPIException { @@ -157,7 +150,6 @@ public class PortalRestAPIServiceImpl implements IPortalRestAPIService { * (non-Javadoc) * * @see - * com.att.fusion.core.onboarding.crossapi.IPortalRestAPIService#getUserRoles(java.lang.String) */ @Override public List getUserRoles(String loginId) throws PortalAPIException { @@ -168,9 +160,6 @@ public class PortalRestAPIServiceImpl implements IPortalRestAPIService { /* * (non-Javadoc) * - * @see - * com.att.fusion.core.onboarding.crossapi.IPortalRestAPIService#pushUserRole(java.lang.String, - * java.util.List) */ @Override public void pushUserRole(String loginId, List roles) throws PortalAPIException { @@ -197,9 +186,6 @@ public class PortalRestAPIServiceImpl implements IPortalRestAPIService { /* * (non-Javadoc) * - * @see - * com.att.fusion.core.onboarding.crossapi.IPortalRestAPIService#isAppAuthenticated(javax.servlet. - * http.HttpServletRequest) */ @Override public boolean isAppAuthenticated(HttpServletRequest request) throws PortalAPIException { diff --git a/src/main/java/org/onap/aai/sparky/util/NodeUtils.java b/src/main/java/org/onap/aai/sparky/util/NodeUtils.java index a62292d..94c2b3e 100644 --- a/src/main/java/org/onap/aai/sparky/util/NodeUtils.java +++ b/src/main/java/org/onap/aai/sparky/util/NodeUtils.java @@ -404,12 +404,12 @@ public class NodeUtils { String resourceId = null; if ("/".equals(link.substring(linkLength - 1))) { // Use-case: - // https://aai-ext1.test.att.com:9292/aai/v7/business/customers/customer/1607_20160524Func_Ak1_01/service-subscriptions/service-subscription/uCPE-VMS/ + // https://ext1.test.onap.com:9292/aai/v7/business/customers/customer/1607_20160524Func_Ak1_01/service-subscriptions/service-subscription/uCPE-VMS/ startIndex = link.lastIndexOf("/", linkLength - 2); resourceId = link.substring(startIndex + 1, linkLength - 1); } else { // Use-case: - // https://aai-ext1.test.att.com:9292/aai/v7/business/customers/customer/1607_20160524Func_Ak1_01/service-subscriptions/service-subscription/uCPE-VMS + // https://ext1.test.onap.com:9292/aai/v7/business/customers/customer/1607_20160524Func_Ak1_01/service-subscriptions/service-subscription/uCPE-VMS startIndex = link.lastIndexOf("/"); resourceId = link.substring(startIndex + 1, linkLength); } diff --git a/src/main/java/org/onap/aai/sparky/viewandinspect/entity/ActiveInventoryNode.java b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/ActiveInventoryNode.java index 2c3b97f..c5d9b4a 100644 --- a/src/main/java/org/onap/aai/sparky/viewandinspect/entity/ActiveInventoryNode.java +++ b/src/main/java/org/onap/aai/sparky/viewandinspect/entity/ActiveInventoryNode.java @@ -459,7 +459,6 @@ public class ActiveInventoryNode { } public boolean isDirectSelfLink() { - // https://aai-int1.test.att.com:8443/aai/v8/resources/id/2458124400 return isDirectSelfLink(this.selfLink); } @@ -470,8 +469,7 @@ public class ActiveInventoryNode { * @return true, if is direct self link */ public static boolean isDirectSelfLink(String link) { - // https://aai-int1.test.att.com:8443/aai/v8/resources/id/2458124400 - + if (link == null) { return false; } -- cgit 1.2.3-korg