1 files changed, 21 insertions, 12 deletions

diff --git a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/FilterKeyEnum.java b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/FilterKeyEnum.java
index a4dc0084cc..3ba4ca62cd 100644
--- a/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/FilterKeyEnum.java
+++ b/common-be/src/main/java/org/openecomp/sdc/be/datatypes/enums/FilterKeyEnum.java
@@ -15,35 +15,44 @@
 package org.openecomp.sdc.be.datatypes.enums;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
 @Getter
 @AllArgsConstructor
 public enum FilterKeyEnum {
-    RESOURCE_TYPE("resourceType"), SUB_CATEGORY("subCategory"), CATEGORY("category"), DISTRIBUTION_STATUS("distributionStatus"), NAME_FRAGMENT(
-        "nameFragment");
-    private static final int NUMBER_OF_RESOURCES_FILTERED = 3;
-    private static final int NUMBER_OF_SERVICES_FILTERED = 4;
+    RESOURCE_TYPE("resourceType"),
+    SUB_CATEGORY("subCategory"),
+    CATEGORY("category"),
+    VERSION("version"),
+    METADATA("metadata"),
+    DISTRIBUTION_STATUS("distributionStatus"),
+    NAME_FRAGMENT("nameFragment");
     private final String name;
 
-    public static List<String> getAllFilters() {
-        return Arrays.stream(FilterKeyEnum.values()).map(FilterKeyEnum::getName).collect(Collectors.toList());
-    }
+    private static final List<String> RESOURCES_FILTERED = Arrays.asList(
+        RESOURCE_TYPE.getName(),
+        SUB_CATEGORY.getName(),
+        CATEGORY.getName());
+    private static final List<String> SERVICES_FILTERED = Arrays.asList(
+        CATEGORY.getName(),
+        DISTRIBUTION_STATUS.getName(),
+        VERSION.getName(),
+        METADATA.getName());
 
     public static List<String> getValidFiltersByAssetType(ComponentTypeEnum assetType) {
         if (assetType == null) {
-            return null;
+            return Collections.emptyList();
         }
         switch (assetType) {
             case RESOURCE:
-                return getAllFilters().subList(0, NUMBER_OF_RESOURCES_FILTERED);
+                return RESOURCES_FILTERED;
             case SERVICE:
-                return getAllFilters().subList(2, NUMBER_OF_SERVICES_FILTERED);
+                return SERVICES_FILTERED;
             default:
-                return null;
+                return Collections.emptyList();
         }
     }
 }