Require default value for FeatureFlag

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 {