cleaned up resolve normalizer

Author: mridula-s109

x-pack/plugin/rank-rrf/src/main/java/org/elasticsearch/xpack/rank/linear/LinearRetrieverBuilder.java

@@ -75,16 +75,6 @@ public final class LinearRetrieverBuilder extends CompoundRetrieverBuilder<Linea
     private final String query;
     private final ScoreNormalizer normalizer;
 
-    private static ScoreNormalizer resolveNormalizer(ScoreNormalizer componentNormalizer, ScoreNormalizer topLevelNormalizer) {
-        if (componentNormalizer != null) {
-            return componentNormalizer;
-        }
-        if (topLevelNormalizer != null) {
-            return topLevelNormalizer;
-        }
-        return DEFAULT_NORMALIZER;
-    }
-
     @SuppressWarnings("unchecked")
     static final ConstructingObjectParser<LinearRetrieverBuilder, RetrieverParserContext> PARSER = new ConstructingObjectParser<>(
         NAME,
@@ -133,6 +123,16 @@ private static ScoreNormalizer[] getDefaultNormalizers(List<RetrieverSource> inn
         return normalizers;
     }
 
+    private static ScoreNormalizer resolveNormalizer(ScoreNormalizer componentNormalizer, ScoreNormalizer topLevelNormalizer) {
+        if (componentNormalizer != null) {
+            return componentNormalizer;
+        }
+        if (topLevelNormalizer != null) {
+            return topLevelNormalizer;
+        }
+        return DEFAULT_NORMALIZER;
+    }
+
     public static LinearRetrieverBuilder fromXContent(XContentParser parser, RetrieverParserContext context) throws IOException {
         if (context.clusterSupportsFeature(LINEAR_RETRIEVER_SUPPORTED) == false) {
             throw new ParsingException(parser.getTokenLocation(), "unknown retriever [" + NAME + "]");
@@ -341,7 +341,7 @@ protected RetrieverBuilder doRewrite(QueryRewriteContext ctx) {
                     for (var weightedRetriever : r) {
                         retrievers.add(weightedRetriever.retrieverSource());
                         weights[index] = weightedRetriever.weight();
-                        normalizers[index] = resolveNormalizer(null, normalizer);
+                        normalizers[index] = normalizer;
                         index++;
                     }
 
@@ -359,7 +359,7 @@ protected RetrieverBuilder doRewrite(QueryRewriteContext ctx) {
                 Arrays.fill(weights, DEFAULT_WEIGHT);
 
                 ScoreNormalizer[] normalizers = new ScoreNormalizer[fieldsInnerRetrievers.size()];
-                Arrays.fill(normalizers, resolveNormalizer(null, normalizer));
+                Arrays.fill(normalizers, normalizer);
 
                 // TODO: This is a incomplete solution as it does not address other incomplete copy issues
                 // (such as dropping the retriever name and min score)