diff --git a/open-api/rest-catalog-open-api.py b/open-api/rest-catalog-open-api.py index ad3eed00439b..939289a46012 100644 --- a/open-api/rest-catalog-open-api.py +++ b/open-api/rest-catalog-open-api.py @@ -155,74 +155,6 @@ class ExpressionType(RootModel[str]): ) -class TrueExpression(BaseModel): - """ - Deprecated. Use the bare boolean literal `true` as a predicate instead. - - """ - - type: Literal['true'] = Field( - ..., - examples=[ - [ - 'true', - 'false', - 'eq', - 'and', - 'or', - 'not', - 'in', - 'not-in', - 'lt', - 'lt-eq', - 'gt', - 'gt-eq', - 'not-eq', - 'starts-with', - 'not-starts-with', - 'is-null', - 'not-null', - 'is-nan', - 'not-nan', - ] - ], - ) - - -class FalseExpression(BaseModel): - """ - Deprecated. Use the bare boolean literal `false` as a predicate instead. - - """ - - type: Literal['false'] = Field( - ..., - examples=[ - [ - 'true', - 'false', - 'eq', - 'and', - 'or', - 'not', - 'in', - 'not-in', - 'lt', - 'lt-eq', - 'gt', - 'gt-eq', - 'not-eq', - 'starts-with', - 'not-starts-with', - 'is-null', - 'not-null', - 'is-nan', - 'not-nan', - ] - ], - ) - - class IdReference(BaseModel): """ A bound reference to a field by field ID. @@ -2340,8 +2272,6 @@ class Type(RootModel[VariantType | PrimitiveType | StructType | ListType | MapTy class Predicate( RootModel[ bool - | TrueExpression - | FalseExpression | AndOrPredicate | NotPredicate | UnaryPredicate @@ -2351,8 +2281,6 @@ class Predicate( ): root: ( bool - | TrueExpression - | FalseExpression | AndOrPredicate | NotPredicate | UnaryPredicate diff --git a/open-api/rest-catalog-open-api.yaml b/open-api/rest-catalog-open-api.yaml index 2064e670a46c..f60b0f60f750 100644 --- a/open-api/rest-catalog-open-api.yaml +++ b/open-api/rest-catalog-open-api.yaml @@ -2547,8 +2547,6 @@ components: Predicate: oneOf: - type: boolean - - $ref: '#/components/schemas/TrueExpression' - - $ref: '#/components/schemas/FalseExpression' - $ref: '#/components/schemas/AndOrPredicate' - $ref: '#/components/schemas/NotPredicate' - $ref: '#/components/schemas/UnaryPredicate' @@ -2586,30 +2584,6 @@ components: - $ref: '#/components/schemas/Reference' - $ref: '#/components/schemas/Apply' - TrueExpression: - deprecated: true - description: > - Deprecated. Use the bare boolean literal `true` as a predicate instead. - type: object - required: - - type - properties: - type: - $ref: '#/components/schemas/ExpressionType' - const: "true" - - FalseExpression: - deprecated: true - description: > - Deprecated. Use the bare boolean literal `false` as a predicate instead. - type: object - required: - - type - properties: - type: - $ref: '#/components/schemas/ExpressionType' - const: "false" - AndOrPredicate: type: object required: