remove Delegating strategy and pass context to isActive

Author: jboulter

src/main/java/com/hubspot/jinjava/features/DateTimeFeatureActivationStrategy.java

@@ -1,5 +1,6 @@
 package com.hubspot.jinjava.features;
 
+import com.hubspot.jinjava.interpret.Context;
 import java.time.LocalDateTime;
 
 public class DateTimeFeatureActivationStrategy implements FeatureActivationStrategy {
@@ -14,7 +15,7 @@ private DateTimeFeatureActivationStrategy(LocalDateTime activateAt) {
   }
 
   @Override
-  public boolean isActive() {
+  public boolean isActive(Context context) {
     return LocalDateTime.now().isAfter(activateAt);
   }
 

src/main/java/com/hubspot/jinjava/features/DelegatingFeatureActivationStrategy.java

@@ -1,5 +1,7 @@
 package com.hubspot.jinjava.features;
 
+import com.hubspot.jinjava.interpret.Context;
+
 public interface FeatureActivationStrategy {
-  boolean isActive();
+  boolean isActive(Context context);
 }

src/main/java/com/hubspot/jinjava/features/FeatureActivationStrategy.java

@@ -1,10 +1,6 @@
 package com.hubspot.jinjava.features;
 
 public class FeatureStrategies {
-  public static final FeatureActivationStrategy INACTIVE = DelegatingFeatureActivationStrategy.of(
-    () -> false
-  );
-  public static final FeatureActivationStrategy ACTIVE = DelegatingFeatureActivationStrategy.of(
-    () -> true
-  );
+  public static final FeatureActivationStrategy INACTIVE = c -> false;
+  public static final FeatureActivationStrategy ACTIVE = c -> true;
 }

src/main/java/com/hubspot/jinjava/features/FeatureStrategies.java

@@ -1,14 +1,16 @@
 package com.hubspot.jinjava.features;
 
+import com.hubspot.jinjava.interpret.Context;
+
 public class Features {
   private final FeatureConfig featureConfig;
 
   public Features(FeatureConfig featureConfig) {
     this.featureConfig = featureConfig;
   }
 
-  public boolean isActive(String featureName) {
-    return getActivationStrategy(featureName).isActive();
+  public boolean isActive(String featureName, Context context) {
+    return getActivationStrategy(featureName).isActive(context);
   }
 
   public FeatureActivationStrategy getActivationStrategy(String featureName) {

src/main/java/com/hubspot/jinjava/features/Features.java

@@ -3,10 +3,10 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 import com.hubspot.jinjava.features.DateTimeFeatureActivationStrategy;
-import com.hubspot.jinjava.features.DelegatingFeatureActivationStrategy;
 import com.hubspot.jinjava.features.FeatureConfig;
 import com.hubspot.jinjava.features.FeatureStrategies;
 import com.hubspot.jinjava.features.Features;
+import com.hubspot.jinjava.interpret.Context;
 import java.time.LocalDateTime;
 import org.junit.Before;
 import org.junit.Test;
@@ -22,6 +22,8 @@ public class FeaturesTest {
 
   private boolean delegateActive = false;
 
+  private Context context = new Context();
+
   @Before
   public void setUp() throws Exception {
     features =
@@ -32,41 +34,41 @@ public void setUp() throws Exception {
           .add(ALWAYS_ON, FeatureStrategies.ACTIVE)
           .add(DATE_PAST, DateTimeFeatureActivationStrategy.of(LocalDateTime.MIN))
           .add(DATE_FUTURE, DateTimeFeatureActivationStrategy.of(LocalDateTime.MAX))
-          .add(DELEGATING, DelegatingFeatureActivationStrategy.of(() -> delegateActive))
+          .add(DELEGATING, d -> delegateActive)
           .build()
       );
   }
 
   @Test
   public void itHasEnabledFeature() {
-    assertThat(features.isActive(ALWAYS_ON)).isTrue();
+    assertThat(features.isActive(ALWAYS_ON, context)).isTrue();
   }
 
   @Test
   public void itDoesNotHaveDisabledFeature() {
-    assertThat(features.isActive(ALWAYS_OFF)).isFalse();
+    assertThat(features.isActive(ALWAYS_OFF, context)).isFalse();
   }
 
   @Test
   public void itHasPastEnabledFeature() {
-    assertThat(features.isActive(DATE_PAST)).isTrue();
+    assertThat(features.isActive(DATE_PAST, context)).isTrue();
   }
 
   @Test
   public void itDoesNotHaveFutureEnabledFeature() {
-    assertThat(features.isActive(DATE_FUTURE)).isFalse();
+    assertThat(features.isActive(DATE_FUTURE, context)).isFalse();
   }
 
   @Test
   public void itUsesDelegate() {
     delegateActive = false;
-    assertThat(features.isActive(DELEGATING)).isEqualTo(delegateActive);
+    assertThat(features.isActive(DELEGATING, context)).isEqualTo(delegateActive);
     delegateActive = true;
-    assertThat(features.isActive(DELEGATING)).isEqualTo(delegateActive);
+    assertThat(features.isActive(DELEGATING, context)).isEqualTo(delegateActive);
   }
 
   @Test
   public void itDefaultsToFalse() {
-    assertThat(features.isActive("unknown")).isFalse();
+    assertThat(features.isActive("unknown", context)).isFalse();
   }
 }