Update to use Environment properties instead of enums

Spring Boot users will prefer this style of configuration.

(Requires changes in togglz, submitted as a PR)

spring-boot-hello-world/pom.xml

@@ -54,11 +54,6 @@
       <artifactId>togglz-console</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.togglz</groupId>
-      <artifactId>togglz-junit</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.togglz</groupId>
       <artifactId>togglz-spring-boot-starter</artifactId>

spring-boot-hello-world/src/main/java/sample/HelloWorldController.java

@@ -3,17 +3,30 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.togglz.core.Feature;
+import org.togglz.core.manager.FeatureManager;
+import org.togglz.core.util.NamedFeature;
 
 @RestController
 public class HelloWorldController {
 
     private static final String GREETING = "Greetings from Spring Boot!";
+
+    private final FeatureManager manager;
 
-    @RequestMapping("/")
+    public static final Feature HELLO_WORLD = new NamedFeature("HELLO_WORLD");
+
+    public static final Feature REVERSE_GREETING = new NamedFeature("REVERSE_GREETING");
+
+    public HelloWorldController(FeatureManager manager) {
+		this.manager = manager;
+	}
+
+	@RequestMapping("/")
     public ResponseEntity<?> index() {
-        if (MyFeatures.HELLO_WORLD.isActive()) {
+        if (manager.isActive(HELLO_WORLD)) {
             StringBuilder sb = new StringBuilder(GREETING);
-            if (MyFeatures.REVERSE_GREETING.isActive()) {
+            if (manager.isActive(REVERSE_GREETING)) {
                 sb.reverse();
             }
             return ResponseEntity.ok().body(sb.toString());

spring-boot-hello-world/src/main/resources/application.yml

@@ -2,9 +2,10 @@ logging:
   level:
     org.togglz: DEBUG
 togglz:
-  feature-enums: sample.MyFeatures
   features:
-    HELLO_WORLD: true
-    REVERSE_GREETING: false
+    HELLO_WORLD:
+      enabled: true
+    REVERSE_GREETING:
+      enabled: false
   console:
     secured: false

spring-boot-hello-world/src/test/java/sample/HelloWorldControllerIntegrationTests.java

@@ -4,44 +4,42 @@
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
-import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 import org.springframework.test.web.servlet.MockMvc;
-import org.togglz.junit.TogglzRule;
+import org.togglz.core.repository.FeatureState;
+import org.togglz.core.repository.StateRepository;
 
 @RunWith(SpringRunner.class)
 @SpringBootTest
 @AutoConfigureMockMvc
 public class HelloWorldControllerIntegrationTests {
-
-    @Rule
-    public TogglzRule togglzRule = TogglzRule.allDisabled(MyFeatures.class);
+	
+	@Autowired
+	private StateRepository state;
 
     @Autowired
     private MockMvc mockMvc;
 
     @Test
     public void testHelloWorldFeatureDisabled() throws Exception {
-        togglzRule.disable(MyFeatures.HELLO_WORLD);
+        state.setFeatureState(new FeatureState(HelloWorldController.HELLO_WORLD, false));
         mockMvc.perform(get("")).andExpect(status().isNotFound());
     }
 
     @Test
     public void testHelloWorldFeatureEnabled() throws Exception {
-        togglzRule.enable(MyFeatures.HELLO_WORLD);
         mockMvc.perform(get("")).andExpect(status().isOk())
                 .andExpect(content().string("Greetings from Spring Boot!"));
     }
 
     @Test
     public void testHelloWorldFeatureAndReverseGreetingEnabled() throws Exception {
-        togglzRule.enable(MyFeatures.HELLO_WORLD);
-        togglzRule.enable(MyFeatures.REVERSE_GREETING);
+        state.setFeatureState(new FeatureState(HelloWorldController.REVERSE_GREETING, true));
         mockMvc.perform(get("")).andExpect(status().isOk())
                 .andExpect(content().string("!tooB gnirpS morf sgniteerG"));
     }

spring-boot-no-feature-provider-or-feature-enums/pom.xml

@@ -54,11 +54,6 @@
       <artifactId>togglz-console</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.togglz</groupId>
-      <artifactId>togglz-junit</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.togglz</groupId>
       <artifactId>togglz-spring-boot-starter</artifactId>

spring-boot-no-feature-provider-or-feature-enums/src/main/java/sample/HelloWorldController.java

@@ -10,7 +10,7 @@ public class HelloWorldController {
     private static final String GREETING = "Greetings from Spring Boot!";
 
     @RequestMapping("/")
-    public ResponseEntity index() {
+    public ResponseEntity<?> index() {
         return ResponseEntity.ok().body(GREETING);
     }
 }

spring-boot-security/pom.xml

@@ -65,11 +65,6 @@
       <artifactId>togglz-console</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.togglz</groupId>
-      <artifactId>togglz-junit</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.togglz</groupId>
       <artifactId>togglz-spring-security</artifactId>

spring-boot-security/src/main/java/sample/Application.java

@@ -3,24 +3,15 @@
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.security.SecurityProperties;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-import org.togglz.core.manager.EnumBasedFeatureProvider;
-import org.togglz.core.spi.FeatureProvider;
 
 @SpringBootApplication
 public class Application {
 
-    @SuppressWarnings("unchecked")
-	@Bean
-    public FeatureProvider featureProvider() {
-        return new EnumBasedFeatureProvider(MyFeatures.class);
-    }
-
     @Configuration
     @Order(SecurityProperties.ACCESS_OVERRIDE_ORDER)
     protected static class ApplicationSecurity extends WebSecurityConfigurerAdapter {

spring-boot-security/src/main/java/sample/HelloWorldController.java

@@ -1,28 +1,32 @@
 package sample;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import org.togglz.core.Feature;
 import org.togglz.core.manager.FeatureManager;
+import org.togglz.core.util.NamedFeature;
 
 @RestController
 public class HelloWorldController {
 
     private static final String GREETING = "Greetings from Spring Boot!";
 
-    private FeatureManager featureManager;
+    private final FeatureManager manager;
 
-    @Autowired
-    public HelloWorldController(FeatureManager featureManager) {
-        this.featureManager = featureManager;
-    }
+    public static final Feature HELLO_WORLD = new NamedFeature("HELLO_WORLD");
+
+    public static final Feature REVERSE_GREETING = new NamedFeature("REVERSE_GREETING");
+
+    public HelloWorldController(FeatureManager manager) {
+		this.manager = manager;
+	}
 
     @RequestMapping("/")
     public ResponseEntity<?> index() {
-        if (featureManager.isActive(MyFeatures.HELLO_WORLD)) {
+        if (manager.isActive(HELLO_WORLD)) {
             StringBuilder sb = new StringBuilder(GREETING);
-            if (featureManager.isActive(MyFeatures.REVERSE_GREETING)) {
+            if (manager.isActive(REVERSE_GREETING)) {
                 sb.reverse();
             }
             return ResponseEntity.ok().body(sb.toString());

spring-boot-security/src/main/resources/application.yml

@@ -5,7 +5,14 @@ togglz:
   console:
     feature-admin-authority: ROLE_ADMIN
   feature-manager-name: My Feature Manager
-  features-file: classpath:/features.properties
+  features:
+    HELLO_WORLD:
+      enabled: true
+    REVERSE_GREETING:
+      enabled: true
+      strategy: username
+      param:
+        users: user2,user3
   cache:
     enable: true
     time-to-live: 10000

spring-boot-security/src/test/java/sample/HelloWorldControllerIntegrationTests.java

@@ -8,7 +8,6 @@
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;

spring-boot-thymeleaf/pom.xml

@@ -54,11 +54,6 @@
       <artifactId>togglz-console</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.togglz</groupId>
-      <artifactId>togglz-junit</artifactId>
-    </dependency>
-
     <dependency>
       <groupId>org.togglz</groupId>
       <artifactId>togglz-spring-boot-starter</artifactId>

spring-boot-thymeleaf/src/main/resources/application.yml

@@ -3,9 +3,10 @@ logging:
   level:
     org.togglz: DEBUG
 togglz:
-  feature-enums: sample.MyFeatures
   features:
-    HELLO_WORLD: true
-    REVERSE_GREETING: false
+    HELLO_WORLD:
+      enabled: true
+    REVERSE_GREETING:
+      enabled: false
   console:
     secured: false

spring-boot-thymeleaf/src/test/java/sample/HelloWorldControllerIntegrationTests.java

@@ -0,0 +1,55 @@
+package sample;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.hamcrest.CoreMatchers.not;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
+import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.test.web.servlet.MockMvc;
+import org.togglz.core.Feature;
+import org.togglz.core.repository.FeatureState;
+import org.togglz.core.repository.StateRepository;
+import org.togglz.core.util.NamedFeature;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+@AutoConfigureMockMvc
+public class HelloWorldControllerIntegrationTests {
+
+	private static Feature HELLO_WORLD = new NamedFeature("HELLO_WORLD");
+
+	private static Feature REVERSE_GREETING = new NamedFeature("REVERSE_GREETING");
+
+	@Autowired
+	private StateRepository state;
+
+	@Autowired
+	private MockMvc mockMvc;
+
+	@Test
+	public void testHelloWorldFeatureDisabled() throws Exception {
+		state.setFeatureState(new FeatureState(HELLO_WORLD, false));
+		mockMvc.perform(get("")).andExpect(status().isOk())
+				.andExpect(content().string(not(containsString("Greetings from Spring Boot!"))));
+	}
+
+	@Test
+	public void testHelloWorldFeatureEnabled() throws Exception {
+		mockMvc.perform(get("")).andExpect(status().isOk())
+				.andExpect(content().string(containsString("Greetings from Spring Boot!")));
+	}
+
+	@Test
+	public void testHelloWorldFeatureAndReverseGreetingEnabled() throws Exception {
+		state.setFeatureState(new FeatureState(REVERSE_GREETING, true));
+		mockMvc.perform(get("")).andExpect(status().isOk())
+				.andExpect(content().string(containsString("!tooB gnirpS morf sgniteerG")));
+	}
+}