Fix for Feature Toggle rest module

Removed ToggleStatus class and replaced it with ToggleableFeature class

Change-Id: I6a4ec4504ab697e71a2f4e63d1a73aa78c7b0647
Issue-ID: SDC-988
Signed-off-by: siddharth0905 <siddharth.singh4@amdocs.com>

4 files changed, 6 insertions, 14 deletions

diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/main/java/org/openecomp/sdcrests/togglz/rest/mapping/MapToggleableFeatureToDto.java b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/main/java/org/openecomp/sdcrests/togglz/rest/mapping/MapToggleableFeatureToDto.java
index 769622d35e..7fe65427e9 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/main/java/org/openecomp/sdcrests/togglz/rest/mapping/MapToggleableFeatureToDto.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/main/java/org/openecomp/sdcrests/togglz/rest/mapping/MapToggleableFeatureToDto.java
@@ -15,6 +15,7 @@
  */
 package org.openecomp.sdcrests.togglz.rest.mapping;
 
+import org.openecomp.sdc.common.togglz.ToggleableFeature;
 import org.openecomp.sdcrests.mapping.MappingBase;
 import org.openecomp.sdcrests.togglz.types.FeatureDto;
 import org.openecomp.sdcrests.togglz.types.FeatureSetDto;
@@ -23,12 +24,11 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.Set;
 import java.util.stream.Collectors;
-import  org.openecomp.sdc.common.togglz.ToggleStatus;
 
-public class MapToggleableFeatureToDto extends MappingBase<Collection<ToggleStatus>, FeatureSetDto> {
+public class MapToggleableFeatureToDto extends MappingBase<Collection<ToggleableFeature>, FeatureSetDto> {
 
     @Override
-    public void doMapping(Collection<ToggleStatus> source, FeatureSetDto target) {
+    public void doMapping(Collection<ToggleableFeature> source, FeatureSetDto target) {
         if (source != null && !source.isEmpty()){
             Set<FeatureDto> fDtos = source.stream().map(f -> new FeatureDto(f.name(), f.isActive()))
                 .collect(Collectors.toSet());
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/java/org/openecomp/TogglzFeatureRestTest.java b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/java/org/openecomp/TogglzFeatureRestTest.java
index 8170048acd..c3244eb71f 100644
--- a/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/java/org/openecomp/TogglzFeatureRestTest.java
+++ b/openecomp-be/api/openecomp-sdc-rest-webapp/togglz-rest/togglz-rest-services/src/test/java/org/openecomp/TogglzFeatureRestTest.java
@@ -2,7 +2,6 @@ package org.openecomp;
 
 import com.google.common.collect.Sets;
 import org.junit.Test;
-import org.openecomp.sdc.common.togglz.ToggleStatus;
 import org.openecomp.sdc.common.togglz.ToggleableFeature;
 import org.openecomp.sdcrests.togglz.rest.TogglzFeatures;
 import org.openecomp.sdcrests.togglz.rest.mapping.MapToggleableFeatureToDto;
@@ -34,7 +33,7 @@ public class TogglzFeatureRestTest {
         when(tf.isActive()).thenReturn(ACTIVE);
         MapToggleableFeatureToDto mapToggleableFeatureToDto = new MapToggleableFeatureToDto();
         FeatureSetDto target = new FeatureSetDto();
-        Collection<ToggleStatus> source = Collections.singletonList(tf);
+        Collection<ToggleableFeature> source = Collections.singletonList(tf);
         mapToggleableFeatureToDto.doMapping(source, target);
         assertEquals(source.size(), target.getFeatures().size());
         FeatureDto result = target.getFeatures().iterator().next();
diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleStatus.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleStatus.java
deleted file mode 100644
index e72f85a652..0000000000
--- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleStatus.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package org.openecomp.sdc.common.togglz;
-
-import org.togglz.core.Feature;
-
-public interface ToggleStatus extends Feature {
-     boolean isActive();
-}
diff --git a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java
index cae1033b52..aab9845573 100644
--- a/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java
+++ b/openecomp-be/lib/openecomp-common-lib/src/main/java/org/openecomp/sdc/common/togglz/ToggleableFeature.java
@@ -1,14 +1,14 @@
 package org.openecomp.sdc.common.togglz;
 
+import org.togglz.core.Feature;
 import org.togglz.core.annotation.Label;
 import org.togglz.core.context.FeatureContext;
 
-public enum ToggleableFeature implements ToggleStatus {
+public enum ToggleableFeature implements Feature {
 
   @Label ("Forwarder Capability")
   FORWARDER_CAPABILITY;
 
-  @Override
   public boolean isActive() {
     return FeatureContext.getFeatureManager().isActive(this);
   }