From 3298634701b112799efd1f78c45a6975962baf99 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Mon, 9 May 2022 19:27:45 +0200 Subject: Revert "Revert "Make config generation deterministic by sorting the expressions by th…"" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/yahoo/searchdefinition/LargeRankExpressions.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'config-model/src/main/java/com/yahoo/searchdefinition/LargeRankExpressions.java') diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/LargeRankExpressions.java b/config-model/src/main/java/com/yahoo/searchdefinition/LargeRankExpressions.java index a1299c12307..41ed2cbe999 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/LargeRankExpressions.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/LargeRankExpressions.java @@ -3,9 +3,10 @@ package com.yahoo.searchdefinition; import com.yahoo.config.application.api.FileRegistry; -import java.util.Collections; +import java.util.Collection; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Collectors; public class LargeRankExpressions { private final Map expressions = new ConcurrentHashMap<>(); @@ -36,9 +37,9 @@ public class LargeRankExpressions { } public int limit() { return limit; } - /** Returns a read-only map of the ranking constants in this indexed by name */ - public Map asMap() { - return Collections.unmodifiableMap(expressions); + /** Returns a read-only list of ranking constants ordered by name */ + public Collection expressions() { + return expressions.values().stream().sorted().collect(Collectors.toUnmodifiableList()); } } -- cgit v1.2.3