From 1aaf42be5a233e573068fadcabf2cff736b74b07 Mon Sep 17 00:00:00 2001
From: Thomas Farr <tsfarr@amazon.com>
Date: Fri, 21 Feb 2025 03:09:24 +1300
Subject: [PATCH] Fix FilterQueryRequestProcessor to use correct query type
 (#821)

Signed-off-by: Thomas Farr <tsfarr@amazon.com>
---
 CHANGELOG.md                              |  3 +-
 spec/schemas/search_pipeline._common.yaml | 74 +----------------------
 2 files changed, 3 insertions(+), 74 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e72765caf..465a9be34 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -109,7 +109,8 @@ Inspired from [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 - Fixed core API schemas ([#777](https://github.com/opensearch-project/opensearch-api-specification/pull/777))
 - Fixed Memory Circuit Breaker flaky error in ML APIs ([#788](https://github.com/opensearch-project/opensearch-api-specification/pull/788))
 - Fixed GeoDistanceSort schema ([#805](https://github.com/opensearch-project/opensearch-api-specification/pull/805))
-- Fixed Aggregation schemas([#801](https://github.com/opensearch-project/opensearch-api-specification/pull/801))
+- Fixed Aggregation schemas ([#801](https://github.com/opensearch-project/opensearch-api-specification/pull/801))
+- Fixed FilterQueryRequestProcessor to use correct query type ([#821](https://github.com/opensearch-project/opensearch-api-specification/pull/821))
 
 ### Changed
 - Changed `tasks._common:TaskInfo` and `tasks._common:TaskGroup` to be composed of a `tasks._common:TaskInfoBase` ([#683](https://github.com/opensearch-project/opensearch-api-specification/pull/683))
diff --git a/spec/schemas/search_pipeline._common.yaml b/spec/schemas/search_pipeline._common.yaml
index 1b6d32666..204d373e0 100644
--- a/spec/schemas/search_pipeline._common.yaml
+++ b/spec/schemas/search_pipeline._common.yaml
@@ -68,79 +68,7 @@ components:
         ignore_failure:
           type: boolean
         query:
-          $ref: '#/components/schemas/UserDefinedObjectStructure'
-    UserDefinedObjectStructure:
-      type: object
-      properties:
-        bool: {}
-        boosting: {}
-        combined_fields: {}
-        constant_score: {}
-        dis_max: {}
-        distance_feature: {}
-        exists: {}
-        function_score: {}
-        fuzzy:
-          $ref: '#/components/schemas/UserDefinedValueMap'
-        geo_bounding_box: {}
-        geo_distance: {}
-        geo_polygon: {}
-        geo_shape: {}
-        has_child: {}
-        has_parent: {}
-        ids: {}
-        intervals:
-          $ref: '#/components/schemas/UserDefinedValueMap'
-        knn: {}
-        match:
-          $ref: '#/components/schemas/UserDefinedValueMap'
-        match_all: {}
-        match_bool_prefix:
-          $ref: '#/components/schemas/UserDefinedValueMap'
-        match_none: {}
-        match_phrase:
-          $ref: '#/components/schemas/UserDefinedValueMap'
-        match_phrase_prefix:
-          $ref: '#/components/schemas/UserDefinedValueMap'
-        more_like_this: {}
-        multi_match: {}
-        nested: {}
-        parent_id: {}
-        percolate: {}
-        pinned: {}
-        prefix:
-          $ref: '#/components/schemas/UserDefinedValueMap'
-        query_string: {}
-        range:
-          $ref: '#/components/schemas/UserDefinedValueMap'
-        rank_feature: {}
-        regexp:
-          $ref: '#/components/schemas/UserDefinedValueMap'
-        script: {}
-        script_score: {}
-        shape: {}
-        simple_query_string: {}
-        span_containing: {}
-        field_masking_span: {}
-        span_first: {}
-        span_multi: {}
-        span_near: {}
-        span_not: {}
-        span_or: {}
-        span_term:
-          $ref: '#/components/schemas/UserDefinedValueMap'
-        span_within: {}
-        term:
-          $ref: '#/components/schemas/UserDefinedValueMap'
-        terms: {}
-        terms_set:
-          $ref: '#/components/schemas/UserDefinedValueMap'
-        wildcard:
-          $ref: '#/components/schemas/UserDefinedValueMap'
-        wrapper: {}
-    UserDefinedValueMap:
-      type: object
-      additionalProperties: {}
+          $ref: '_common.query_dsl.yaml#/components/schemas/QueryContainer'
     NeuralQueryEnricherRequestProcessor:
       type: object
       properties: