@@ -25,20 +25,16 @@ public class LinearRetrieverComponent implements ToXContentObject {
2525
2626 public static final ParseField RETRIEVER_FIELD = new ParseField ("retriever" );
2727 public static final ParseField WEIGHT_FIELD = new ParseField ("weight" );
28- public static final ParseField NORMALIZER_FIELD = new ParseField ("normalizer" );
2928
3029 static final float DEFAULT_WEIGHT = 1f ;
31- static final ScoreNormalizer DEFAULT_NORMALIZER = IdentityScoreNormalizer .INSTANCE ;
3230
3331 RetrieverBuilder retriever ;
3432 float weight ;
35- ScoreNormalizer normalizer ;
3633
3734 public LinearRetrieverComponent (RetrieverBuilder retrieverBuilder , Float weight , ScoreNormalizer normalizer ) {
3835 assert retrieverBuilder != null ;
3936 this .retriever = retrieverBuilder ;
4037 this .weight = weight == null ? DEFAULT_WEIGHT : weight ;
41- this .normalizer = normalizer == null ? DEFAULT_NORMALIZER : normalizer ;
4238 if (this .weight < 0 ) {
4339 throw new IllegalArgumentException ("[weight] must be non-negative" );
4440 }
@@ -48,7 +44,6 @@ public LinearRetrieverComponent(RetrieverBuilder retrieverBuilder, Float weight,
4844 public XContentBuilder toXContent (XContentBuilder builder , Params params ) throws IOException {
4945 builder .field (RETRIEVER_FIELD .getPreferredName (), retriever );
5046 builder .field (WEIGHT_FIELD .getPreferredName (), weight );
51- builder .field (NORMALIZER_FIELD .getPreferredName (), normalizer .getName ());
5247 return builder ;
5348 }
5449
@@ -59,7 +54,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
5954 args -> {
6055 RetrieverBuilder retrieverBuilder = (RetrieverBuilder ) args [0 ];
6156 Float weight = (Float ) args [1 ];
62- ScoreNormalizer normalizer = (ScoreNormalizer ) args [2 ];
6357 return new LinearRetrieverComponent (retrieverBuilder , weight , normalizer );
6458 }
6559 );
@@ -71,12 +65,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
7165 return innerRetriever ;
7266 }, RETRIEVER_FIELD );
7367 PARSER .declareFloat (optionalConstructorArg (), WEIGHT_FIELD );
74- PARSER .declareField (
75- optionalConstructorArg (),
76- (p , c ) -> ScoreNormalizer .valueOf (p .text ()),
77- NORMALIZER_FIELD ,
78- ObjectParser .ValueType .STRING
79- );
8068 }
8169
8270 public static LinearRetrieverComponent fromXContent (XContentParser parser , RetrieverParserContext context ) throws IOException {
0 commit comments