iluwatar#354 add general boolean method to services for feature status. Change user.toString

mikulucky · mikulucky · commit 4a49f82f2366 · 2016-01-26T21:18:47.000Z
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/Service.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/Service.java
@@ -7,4 +7,6 @@ public interface Service {
 
   String getWelcomeMessage(User user);
 
+  boolean isEnhanced();
+
 }
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersion.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersion.java
@@ -7,21 +7,36 @@
 
 public class PropertiesFeatureToggleVersion implements Service {
 
-  private Properties properties;
+  private boolean isEnhanced;
 
+  /**
+   *
+   * @param properties {@link Properties} used to configure the service and toggle features.
+   */
   public PropertiesFeatureToggleVersion(final Properties properties) {
-    this.properties = properties;
+    if (properties == null) {
+      throw new IllegalArgumentException("No Properties Provided.");
+    } else {
+      try {
+        isEnhanced = (boolean) properties.get("enhancedWelcome");
+      } catch (Exception e) {
+        throw new IllegalArgumentException("Invalid Enhancement Settings Provided.");
+      }
+    }
   }
 
   @Override
   public String getWelcomeMessage(final User user) {
 
-    final boolean enhancedWelcome = (boolean) properties.get("enhancedWelcome");
-
-    if (enhancedWelcome) {
+    if (isEnhanced()) {
       return "Welcome " + user + ". You're using the enhanced welcome message.";
     }
 
     return "Welcome to the application.";
   }
+
+  @Override
+  public boolean isEnhanced() {
+    return isEnhanced;
+  }
 }
diff --git a/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java b/feature-toggle/src/main/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersion.java
@@ -15,4 +15,9 @@ public String getWelcomeMessage(User user) {
     return "I suppose you can use this software.";
   }
 
+  @Override
+  public boolean isEnhanced() {
+    return true;
+  }
+
 }
diff --git a/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersionTest.java b/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/propertiesversion/PropertiesFeatureToggleVersionTest.java
@@ -8,6 +8,8 @@
 import java.util.Properties;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
 
 public class PropertiesFeatureToggleVersionTest {
 
@@ -16,6 +18,7 @@ public void testFeatureTurnedOn() throws Exception {
     final Properties properties = new Properties();
     properties.put("enhancedWelcome",true);
     Service service = new PropertiesFeatureToggleVersion(properties);
+    assertTrue(service.isEnhanced());
     final String welcomeMessage = service.getWelcomeMessage(new User("Jamie No Code"));
     assertEquals("Welcome Jamie No Code. You're using the enhanced welcome message.",welcomeMessage);
   }
@@ -25,6 +28,7 @@ public void testFeatureTurnedOff() throws Exception {
     final Properties properties = new Properties();
     properties.put("enhancedWelcome",false);
     Service service = new PropertiesFeatureToggleVersion(properties);
+    assertFalse(service.isEnhanced());
     final String welcomeMessage = service.getWelcomeMessage(new User("Jamie No Code"));
     assertEquals("Welcome to the application.",welcomeMessage);
   }
diff --git a/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersionTest.java b/feature-toggle/src/test/java/com/iluwatar/featuretoggle/pattern/tieredversion/TieredFeatureToggleVersionTest.java
@@ -7,6 +7,7 @@
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 public class TieredFeatureToggleVersionTest {
 
@@ -33,4 +34,9 @@ public void testGetWelcomeMessageForFreeUser() throws Exception {
     final String expected = "I suppose you can use this software.";
     assertEquals(expected, welcomeMessage);
   }
+
+  @Test
+  public void testIsEnhancedAlwaysTrueAsTiered() throws Exception {
+    assertTrue(service.isEnhanced());
+  }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,4 +7,6 @@ public interface Service {`
`7`	`7`
`8`	`8`	`String getWelcomeMessage(User user);`
`9`	`9`
	`10`	`+ boolean isEnhanced();`
	`11`	`+`
`10`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,9 @@ public String getWelcomeMessage(User user) {`
`15`	`15`	`return "I suppose you can use this software.";`
`16`	`16`	`}`
`17`	`17`
	`18`	`+ @Override`
	`19`	`+ public boolean isEnhanced() {`
	`20`	`+ return true;`
	`21`	`+ }`
	`22`	`+`
`18`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@`
`7`	`7`	`import org.junit.Test;`
`8`	`8`
`9`	`9`	`import static org.junit.Assert.assertEquals;`
	`10`	`+import static org.junit.Assert.assertTrue;`
`10`	`11`
`11`	`12`	`public class TieredFeatureToggleVersionTest {`
`12`	`13`
`@@ -33,4 +34,9 @@ public void testGetWelcomeMessageForFreeUser() throws Exception {`
`33`	`34`	`final String expected = "I suppose you can use this software.";`
`34`	`35`	`assertEquals(expected, welcomeMessage);`
`35`	`36`	`}`
	`37`	`+`
	`38`	`+ @Test`
	`39`	`+ public void testIsEnhancedAlwaysTrueAsTiered() throws Exception {`
	`40`	`+ assertTrue(service.isEnhanced());`
	`41`	`+ }`
`36`	`42`	`}`