changed the header license to new license

[aai/sparky-be.git] / src / main / java / org / onap / aai / sparky / search / filters / FilteredSearchHelper.java

diff --git a/src/main/java/org/onap/aai/sparky/search/filters/FilteredSearchHelper.java b/src/main/java/org/onap/aai/sparky/search/filters/FilteredSearchHelper.java
index 67f4d34..d3fd7fe 100644 (file)
--- a/src/main/java/org/onap/aai/sparky/search/filters/FilteredSearchHelper.java
+++ b/src/main/java/org/onap/aai/sparky/search/filters/FilteredSearchHelper.java
@@ -2,8 +2,8 @@
  * ============LICENSE_START=======================================================
  * org.onap.aai
  * ================================================================================
- * Copyright © 2017 AT&T Intellectual Property. All rights reserved.
- * Copyright © 2017 Amdocs
+ * Copyright © 2017-2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright © 2017-2018 Amdocs
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  * ============LICENSE_END=========================================================
- *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 package org.onap.aai.sparky.search.filters;
 
@@ -40,29 +38,28 @@ import org.onap.aai.sparky.search.filters.entity.UiFilterValueEntity;
 import org.onap.aai.sparky.search.filters.entity.UiFiltersEntity;
 
 public class FilteredSearchHelper {
-  private static final Logger LOG =
-      LoggerFactory.getInstance().getLogger(FilteredSearchHelper.class);
+  private static final Logger LOG = LoggerFactory.getInstance().getLogger(FilteredSearchHelper.class);
 
   private FiltersConfig filtersConfig;
   private Map<String, UiFilterConfig> filtersMap = null;
   private FilterElasticSearchAdapter filterSearchAdapter = null;
-
-  public FilteredSearchHelper(FiltersConfig filterConfig) {
+  
+  public FilteredSearchHelper(FiltersConfig filterConfig,FilterElasticSearchAdapter filterElasticSearchAdapter) {
     this.filtersConfig = filterConfig;
+    this.filterSearchAdapter = filterElasticSearchAdapter;
 
     if (filtersMap == null) {
       filtersMap = new HashMap<>();
 
       final FiltersDetailsConfig uiFiltersConfig = filterConfig.getFiltersConfig();
-
+      
       if (uiFiltersConfig != null) {
         for (UiFilterConfig filter : uiFiltersConfig.getFilters()) {
           filtersMap.put(filter.getFilterId(), filter);
         }
       }
     }
-
-    filterSearchAdapter = new FilterElasticSearchAdapter();
+    
   }
 
   public FiltersConfig getFiltersConfig() {
@@ -77,25 +74,25 @@ public class FilteredSearchHelper {
     List<UiViewListItemConfig> views = filtersConfig.getViewsConfig().getViews();
     List<UiFilterListItemConfig> filters = null;
     UiFiltersEntity viewFiltersList = new UiFiltersEntity();
-
-    if (viewName != null) {
-      for (UiViewListItemConfig view : views) {
+   
+    if(viewName != null) {
+      for (UiViewListItemConfig view: views) {
         if (viewName.equalsIgnoreCase(view.getViewName())) {
           filters = view.getFilters();
           break;
         }
       }
-
+  
       if (filters == null) {
         LOG.error(AaiUiMsgs.VIEW_NAME_NOT_SUPPORTED, viewName);
       } else {
         for (UiFilterListItemConfig filter : filters) {
           FiltersDetailsConfig filtersDetailsConfig = filtersConfig.getFiltersConfig();
-
-          for (UiFilterConfig filterConfig : filtersDetailsConfig.getFilters()) {
+          
+          for (UiFilterConfig filterConfig: filtersDetailsConfig.getFilters()) {
             if (filterConfig.getFilterId().equals(filter.getFilterId())) {
               UiFilterEntity filterEntity = new UiFilterEntity(filterConfig);
-              if (filter.getDefaultValue() != null) {
+              if(filter.getDefaultValue() != null) {
                 filterEntity.setDefaultValue(filter.getDefaultValue());
               }
               viewFiltersList.addFilter(filterEntity);
@@ -106,7 +103,7 @@ public class FilteredSearchHelper {
     }
     return viewFiltersList;
   }
-
+  
   public UiFiltersEntity doFilterEnumeration(List<String> requestedFilterIds) {
     UiFiltersEntity viewFiltersList = new UiFiltersEntity();
 
@@ -118,23 +115,22 @@ public class FilteredSearchHelper {
         UiFilterConfig sourceData = filtersMap.get(requestedFilterId);
         UiFilterEntity filterEntity = new UiFilterEntity(sourceData);
         this.getFilterEnumeration(filterEntity, sourceData);
-        viewFiltersList.addFilter(filterEntity);
+        viewFiltersList.addFilter(filterEntity);        
       }
     }
 
     return viewFiltersList;
   }
-
+  
   public void getFilterEnumeration(UiFilterEntity filter, UiFilterConfig sourceData) {
-    List<String> filterValues =
-        filterSearchAdapter.fetchValuesForFilter(filter, sourceData.getDataSource());
-
-    for (String value : filterValues) {
-      UiFilterValueEntity valueEntity = new UiFilterValueEntity();
-      valueEntity.setDisplayName(value);
-      valueEntity.setFilterValue(value);
-      filter.addFilterValue(valueEntity);
-    }
+   List<String> filterValues = filterSearchAdapter.fetchValuesForFilter(filter, sourceData.getDataSource());
+   
+   for(String value : filterValues) {
+     UiFilterValueEntity valueEntity = new UiFilterValueEntity();
+     valueEntity.setDisplayName(value);
+     valueEntity.setFilterValue(value);
+     filter.addFilterValue(valueEntity);
+   }
   }
 
   public Map<String, UiFilterConfig> getFiltersMap() {
@@ -144,15 +140,15 @@ public class FilteredSearchHelper {
   public void setFiltersMap(Map<String, UiFilterConfig> filtersMap) {
     this.filtersMap = filtersMap;
   }
-
+  
   public UiFilterDataSourceConfig getFilterDataSource(String filterId) {
     UiFilterConfig filterConfig = filtersMap.get(filterId);
     UiFilterDataSourceConfig returnValue = null;
-
-    if (filterConfig != null) {
+    
+    if(filterConfig != null) {
       returnValue = filterConfig.getDataSource();
     }
-
+    
     return returnValue;
   }
 }