diff options
author | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-10-23 12:34:25 +0200 |
---|---|---|
committer | Håkon Hallingstad <hakon@verizonmedia.com> | 2019-10-23 12:34:25 +0200 |
commit | ceca416d6c98edf98dd44e03eb151adb3a7221ad (patch) | |
tree | d7ca0d1d16ccce4c82010cbfbd2de0152fc6b92b /flags | |
parent | ff250e41e38e7bb8ac91b3bcc72d605fc2ec483c (diff) |
Use withX instead of setX
Diffstat (limited to 'flags')
-rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/json/Condition.java | 10 | ||||
-rw-r--r-- | flags/src/test/java/com/yahoo/vespa/flags/json/ConditionTest.java | 8 |
2 files changed, 9 insertions, 9 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/Condition.java b/flags/src/main/java/com/yahoo/vespa/flags/json/Condition.java index 93ccb773de6..46961fbd8cc 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/json/Condition.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/json/Condition.java @@ -38,13 +38,13 @@ public interface Condition extends Predicate<FetchVector> { public CreateParams(FetchVector.Dimension dimension) { this.dimension = Objects.requireNonNull(dimension); } - public CreateParams setValues(String... values) { return setValues(List.of(values)); } - public CreateParams setValues(List<String> values) { + public CreateParams withValues(String... values) { return withValues(List.of(values)); } + public CreateParams withValues(List<String> values) { this.values = List.copyOf(values); return this; } - public CreateParams setPredicate(String predicate) { + public CreateParams withPredicate(String predicate) { this.predicate = Optional.of(predicate); return this; } @@ -63,11 +63,11 @@ public interface Condition extends Predicate<FetchVector> { var params = new CreateParams(dimension); if (wireCondition.values != null) { - params.setValues(wireCondition.values); + params.withValues(wireCondition.values); } if (wireCondition.predicate != null) { - params.setPredicate(wireCondition.predicate); + params.withPredicate(wireCondition.predicate); } switch (type) { diff --git a/flags/src/test/java/com/yahoo/vespa/flags/json/ConditionTest.java b/flags/src/test/java/com/yahoo/vespa/flags/json/ConditionTest.java index b46828b6691..b41da9f567c 100644 --- a/flags/src/test/java/com/yahoo/vespa/flags/json/ConditionTest.java +++ b/flags/src/test/java/com/yahoo/vespa/flags/json/ConditionTest.java @@ -15,7 +15,7 @@ public class ConditionTest { @Test public void testWhitelist() { String hostname1 = "host1"; - var params = new Condition.CreateParams(FetchVector.Dimension.HOSTNAME).setValues(hostname1); + var params = new Condition.CreateParams(FetchVector.Dimension.HOSTNAME).withValues(hostname1); Condition condition = WhitelistCondition.create(params); assertFalse(condition.test(new FetchVector())); assertFalse(condition.test(new FetchVector().with(FetchVector.Dimension.APPLICATION_ID, "foo"))); @@ -26,7 +26,7 @@ public class ConditionTest { @Test public void testBlacklist() { String hostname1 = "host1"; - var params = new Condition.CreateParams(FetchVector.Dimension.HOSTNAME).setValues(hostname1); + var params = new Condition.CreateParams(FetchVector.Dimension.HOSTNAME).withValues(hostname1); Condition condition = BlacklistCondition.create(params); assertTrue(condition.test(new FetchVector())); assertTrue(condition.test(new FetchVector().with(FetchVector.Dimension.APPLICATION_ID, "foo"))); @@ -44,7 +44,7 @@ public class ConditionTest { // Test with empty fetch vector along vespa version dimension (this should never happen as the // version is always available through Vtag, although Vtag has a dummy version number for e.g. // locally run unit tests that hasn't set the release Vespa version). - var params = new Condition.CreateParams(FetchVector.Dimension.VESPA_VERSION).setPredicate(">=7.1.2"); + var params = new Condition.CreateParams(FetchVector.Dimension.VESPA_VERSION).withPredicate(">=7.1.2"); Condition condition = RelationalCondition.create(params); assertFalse(condition.test(new FetchVector())); } @@ -56,7 +56,7 @@ public class ConditionTest { } private boolean vespaVersionCondition(String vespaVersion, String predicate) { - var params = new Condition.CreateParams(FetchVector.Dimension.VESPA_VERSION).setPredicate(predicate); + var params = new Condition.CreateParams(FetchVector.Dimension.VESPA_VERSION).withPredicate(predicate); Condition condition = RelationalCondition.create(params); return condition.test(new FetchVector().with(FetchVector.Dimension.VESPA_VERSION, vespaVersion)); } |