diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-12-04 23:02:42 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-12-04 23:02:42 +0100 |
commit | 5381962e747ea9ac515abcf51dc70ad40bbbf70d (patch) | |
tree | d25af24e6a007091bb4a321a63747f1c7b439045 /flags/src | |
parent | 2555b49b4390ed9dac9eab3959d6cc6e3511515c (diff) |
Revert "Revert collect(Collectors.toList())"
Diffstat (limited to 'flags/src')
3 files changed, 7 insertions, 7 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/FlagData.java b/flags/src/main/java/com/yahoo/vespa/flags/json/FlagData.java index 28dbc588648..19837e7dbe1 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/json/FlagData.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/json/FlagData.java @@ -83,7 +83,7 @@ public class FlagData { wireFlagData.id = id.toString(); if (!rules.isEmpty()) { - wireFlagData.rules = rules.stream().map(Rule::toWire).collect(Collectors.toList()); + wireFlagData.rules = rules.stream().map(Rule::toWire).toList(); } wireFlagData.defaultFetchVector = FetchVectorHelper.toWire(defaultFetchVector); @@ -126,17 +126,17 @@ public class FlagData { public static WireFlagDataList listToWire(List<FlagData> list) { WireFlagDataList wireList = new WireFlagDataList(); - wireList.flags = list.stream().map(FlagData::toWire).collect(Collectors.toList()); + wireList.flags = list.stream().map(FlagData::toWire).toList(); return wireList; } public static List<FlagData> listFromWire(WireFlagDataList wireList) { - return wireList.flags.stream().map(FlagData::fromWire).collect(Collectors.toList()); + return wireList.flags.stream().map(FlagData::fromWire).toList(); } private static List<Rule> rulesFromWire(List<WireRule> wireRules) { if (wireRules == null) return List.of(); - return wireRules.stream().map(Rule::fromWire).collect(Collectors.toList()); + return wireRules.stream().map(Rule::fromWire).toList(); } /** E.g. verify all RawFlag can be deserialized. */ diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/RelationalPredicate.java b/flags/src/main/java/com/yahoo/vespa/flags/json/RelationalPredicate.java index 8eaf38ed577..749c0e2f067 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/json/RelationalPredicate.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/json/RelationalPredicate.java @@ -19,7 +19,7 @@ public class RelationalPredicate { // Make sure we try to match e.g. "<=" before "<" as the prefix of predicateString. List<RelationalOperator> operatorsByDecendingLength = Stream.of(RelationalOperator.values()) .sorted(Comparator.comparing(operator -> - operator.toText().length())) - .collect(Collectors.toList()); + .toList(); for (var operator : operatorsByDecendingLength) { if (predicateString.startsWith(operator.toText())) { diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/Rule.java b/flags/src/main/java/com/yahoo/vespa/flags/json/Rule.java index d7cc5b4ddb2..bddaf8c9e0e 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/json/Rule.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/json/Rule.java @@ -53,7 +53,7 @@ public class Rule { WireRule wireRule = new WireRule(); if (!andConditions.isEmpty()) { - wireRule.andConditions = andConditions.stream().map(Condition::toWire).collect(Collectors.toList()); + wireRule.andConditions = andConditions.stream().map(Condition::toWire).toList(); } wireRule.value = valueToApply.map(RawFlag::asJsonNode).orElse(null); @@ -64,7 +64,7 @@ public class Rule { public static Rule fromWire(WireRule wireRule) { List<Condition> conditions = wireRule.andConditions == null ? Collections.emptyList() : - wireRule.andConditions.stream().map(Condition::fromWire).collect(Collectors.toList()); + wireRule.andConditions.stream().map(Condition::fromWire).toList(); Optional<RawFlag> value = wireRule.value == null ? Optional.empty() : Optional.of(JsonNodeRawFlag.fromJsonNode(wireRule.value)); return new Rule(value, conditions); } |