diff options
Diffstat (limited to 'config-model')
3 files changed, 11 insertions, 7 deletions
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java index 23b5195486b..cdcd13619e8 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/IntermediateCollection.java @@ -12,6 +12,7 @@ import com.yahoo.yolean.Exceptions; import java.io.File; import java.util.ArrayList; +import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -39,7 +40,7 @@ public class IntermediateCollection { this.modelProperties = properties; } - public Map<String, ParsedSchema> getParsedSchemas() { return Map.copyOf(parsedSchemas); } + public Map<String, ParsedSchema> getParsedSchemas() { return Collections.unmodifiableMap(parsedSchemas); } public ParsedSchema getParsedSchema(String name) { return parsedSchemas.get(name); } diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java index ebb6acbc54c..fcbb62b1229 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedField.java @@ -4,6 +4,7 @@ package com.yahoo.searchdefinition.parser; import com.yahoo.searchdefinition.document.Stemming; import java.util.ArrayList; +import java.util.Collections; import java.util.LinkedHashMap; import java.util.List; import java.util.Map; @@ -64,7 +65,7 @@ class ParsedField extends ParsedBlock { Optional<String> getNormalizing() { return Optional.ofNullable(normalizing); } Optional<ParsedIndexingOp> getIndexing() { return Optional.ofNullable(indexingOp); } Optional<ParsedSorting> getSorting() { return Optional.ofNullable(sortSettings); } - Map<String, String> getRankTypes() { return Map.copyOf(rankTypes); } + Map<String, String> getRankTypes() { return Collections.unmodifiableMap(rankTypes); } /** get an existing summary field for modification, or create it */ ParsedSummaryField summaryFieldFor(String name) { diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankProfile.java b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankProfile.java index c0a9e2df73f..1918f31749d 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankProfile.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/parser/ParsedRankProfile.java @@ -73,12 +73,14 @@ class ParsedRankProfile extends ParsedBlock { List<ParsedRankFunction> getFunctions() { return List.copyOf(functions.values()); } List<MutateOperation> getMutateOperations() { return List.copyOf(mutateOperations); } List<String> getInherited() { return List.copyOf(inherited); } - Map<String, Boolean> getFieldsWithRankFilter() { return Map.copyOf(fieldsRankFilter); } - Map<String, Integer> getFieldsWithRankWeight() { return Map.copyOf(fieldsRankWeight); } - Map<String, String> getFieldsWithRankType() { return Map.copyOf(fieldsRankType); } - Map<String, List<String>> getRankProperties() { return Map.copyOf(rankProperties); } - Map<String, Value> getConstants() { return Map.copyOf(constants); } + + Map<String, Boolean> getFieldsWithRankFilter() { return Collections.unmodifiableMap(fieldsRankFilter); } + Map<String, Integer> getFieldsWithRankWeight() { return Collections.unmodifiableMap(fieldsRankWeight); } + Map<String, String> getFieldsWithRankType() { return Collections.unmodifiableMap(fieldsRankType); } + Map<String, List<String>> getRankProperties() { return Collections.unmodifiableMap(rankProperties); } + Map<String, Value> getConstants() { return Collections.unmodifiableMap(constants); } Map<Reference, TensorType> getInputs() { return Collections.unmodifiableMap(inputs); } + Optional<String> getInheritedSummaryFeatures() { return Optional.ofNullable(this.inheritedSummaryFeatures); } Optional<String> getSecondPhaseExpression() { return Optional.ofNullable(this.secondPhaseExpression); } Optional<Boolean> isStrict() { return Optional.ofNullable(this.strict); } |