diff options
author | Håkon Hallingstad <hakon@oath.com> | 2018-11-26 16:39:46 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2018-11-26 16:39:46 +0100 |
commit | 20706ca9cc73099d3e71cdf6f1813465c66012c3 (patch) | |
tree | 7d7adb2224390ac5965e4c3a4be7b0f6917c68d1 /flags | |
parent | c537b48e6bd2d752f2892a9899dd1d36ae58e82b (diff) |
Require default value for FeatureFlag
Diffstat (limited to 'flags')
-rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/FeatureFlag.java | 16 | ||||
-rw-r--r-- | flags/src/test/java/com/yahoo/vespa/flags/FileFlagSourceTest.java | 6 |
2 files changed, 7 insertions, 15 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/FeatureFlag.java b/flags/src/main/java/com/yahoo/vespa/flags/FeatureFlag.java index 164b0ad96e7..7cc5529646e 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/FeatureFlag.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/FeatureFlag.java @@ -4,7 +4,7 @@ package com.yahoo.vespa.flags; import java.util.function.Function; /** - * A FeatureFlag defaults to false (but see {@link #defaultToTrue()}). + * A FeatureFlag is a boolean flag. * * @author hakonhall */ @@ -21,24 +21,16 @@ public class FeatureFlag implements Flag { return source -> new FeatureFlag(id, defaultValue, source); } - public FeatureFlag(String flagId, FlagSource source) { - this(new FlagId(flagId), source); + public FeatureFlag(String flagId, boolean defaultValue, FlagSource source) { + this(new FlagId(flagId), defaultValue, source); } - public FeatureFlag(FlagId id, FlagSource source) { - this(id, false, source); - } - - private FeatureFlag(FlagId id, boolean defaultValue, FlagSource source) { + public FeatureFlag(FlagId id, boolean defaultValue, FlagSource source) { this.id = id; this.defaultValue = defaultValue; this.source = source; } - public FeatureFlag defaultToTrue() { - return new FeatureFlag(id, true, source); - } - @Override public FlagId id() { return id; diff --git a/flags/src/test/java/com/yahoo/vespa/flags/FileFlagSourceTest.java b/flags/src/test/java/com/yahoo/vespa/flags/FileFlagSourceTest.java index 4b7c8c0bbb3..9e7508706ed 100644 --- a/flags/src/test/java/com/yahoo/vespa/flags/FileFlagSourceTest.java +++ b/flags/src/test/java/com/yahoo/vespa/flags/FileFlagSourceTest.java @@ -22,8 +22,8 @@ public class FileFlagSourceTest { @Test public void testFeatureLikeFlags() throws IOException { - FeatureFlag featureFlag = new FeatureFlag(id, source); - FeatureFlag byDefaultTrue = featureFlag.defaultToTrue(); + FeatureFlag featureFlag = new FeatureFlag(id, false, source); + FeatureFlag byDefaultTrue = new FeatureFlag(id, true, source); assertFalse(featureFlag.value()); assertTrue(byDefaultTrue.value()); @@ -60,7 +60,7 @@ public class FileFlagSourceTest { @Test public void parseFailure() throws IOException { - FeatureFlag featureFlag = new FeatureFlag(id, source); + FeatureFlag featureFlag = new FeatureFlag(id, false, source); writeFlag(featureFlag.id().toString(), "garbage"); try { |