From 13f2cb6b0fa377cbb008636361f8333f13282437 Mon Sep 17 00:00:00 2001 From: Xiaohan Song Date: Thu, 19 Dec 2024 16:47:00 -0800 Subject: [PATCH] null value --- .env | 2 +- .../protocol/models/CatalogHelpers.java | 1 + .../protocol/models/v0/CatalogHelpers.java | 1 + .../airbyte_protocol/airbyte_protocol.yaml | 18 ++++++++++-------- .../airbyte_protocol/v0/airbyte_protocol.yaml | 18 +++++++++--------- 5 files changed, 22 insertions(+), 18 deletions(-) diff --git a/.env b/.env index ae9adf3..61041d5 100644 --- a/.env +++ b/.env @@ -1,3 +1,3 @@ # x-release-please-start-version -VERSION=0.14.1 +VERSION=0.14.1-dev # x-release-please-end diff --git a/protocol-models/src/main/java/io/airbyte/protocol/models/CatalogHelpers.java b/protocol-models/src/main/java/io/airbyte/protocol/models/CatalogHelpers.java index ebc6025..c7ab7b9 100644 --- a/protocol-models/src/main/java/io/airbyte/protocol/models/CatalogHelpers.java +++ b/protocol-models/src/main/java/io/airbyte/protocol/models/CatalogHelpers.java @@ -324,4 +324,5 @@ private static boolean isObjectWithSubFields(final Field field) { return field.getType().equals(JsonSchemaType.OBJECT) && field.getSubFields() != null && !field.getSubFields().isEmpty(); } + } diff --git a/protocol-models/src/main/java/io/airbyte/protocol/models/v0/CatalogHelpers.java b/protocol-models/src/main/java/io/airbyte/protocol/models/v0/CatalogHelpers.java index 4212d33..67b9f86 100644 --- a/protocol-models/src/main/java/io/airbyte/protocol/models/v0/CatalogHelpers.java +++ b/protocol-models/src/main/java/io/airbyte/protocol/models/v0/CatalogHelpers.java @@ -328,4 +328,5 @@ private static boolean isObjectWithSubFields(final Field field) { return field.getType().equals(JsonSchemaType.OBJECT) && field.getSubFields() != null && !field.getSubFields().isEmpty(); } + } diff --git a/protocol-models/src/main/resources/airbyte_protocol/airbyte_protocol.yaml b/protocol-models/src/main/resources/airbyte_protocol/airbyte_protocol.yaml index b345c7c..fd00ab1 100644 --- a/protocol-models/src/main/resources/airbyte_protocol/airbyte_protocol.yaml +++ b/protocol-models/src/main/resources/airbyte_protocol/airbyte_protocol.yaml @@ -163,7 +163,9 @@ definitions: stream_descriptor: "$ref": "#/definitions/StreamDescriptor" stream_state: - "$ref": "#/definitions/AirbyteStateBlob" + anyOf: + - "$ref": "#/definitions/AirbyteStateBlob" + - type: null AirbyteGlobalState: type: object additionalProperties: true @@ -524,14 +526,14 @@ definitions: items: type: string generation_id: - description: + description: "Monotically increasing numeric id representing the current generation of a stream. This id can be shared across syncs. If this is null, it means that the platform is not supporting the refresh and it is expected that no extra id will be added to the records and no data from previous generation will be cleanup. " type: integer minimum_generation_id: - description: + description: "The minimum generation id which is needed in a stream. If it is present, the destination will try to delete the data that are part of a generation lower than this property. If the minimum generation is equals to 0, no data deletion is expected from the destiantion @@ -539,7 +541,7 @@ definitions: " type: integer sync_id: - description: + description: "Monotically increasing numeric id representing the current sync id. This is aimed to be unique per sync. If this is null, it means that the platform is not supporting the refresh and it is expected that no extra id will be added to the records and no data from previous generation will be cleanup. @@ -660,12 +662,12 @@ definitions: OAuth specific blob. Pertains to the fields defined by the connector relating to the OAuth flow. type: object additionalProperties: true - required: + required: - consent_url - access_token_url - extract_output properties: - consent_url: + consent_url: type: string description: |- The OAuth Specific string URL string template to initiate the authentication. @@ -675,7 +677,7 @@ definitions: { "consent_url": "https://domain.host.com/oauth2/authorize?{client_id_key}={{client_id_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}&{scope_key}={urlEncoder:{{scope_key}}}&{state_key}={{state_key}}&subdomain={subdomain}" } - scope: + scope: type: string description: |- The OAuth Specific string of the scopes needed to be grant for authenticated user. @@ -684,7 +686,7 @@ definitions: { "scope": "user:read user:read_orders workspaces:read" } - access_token_url: + access_token_url: type: string description: |- The OAuth Specific URL templated string to obtain the `access_token`, `refresh_token` etc. diff --git a/protocol-models/src/main/resources/airbyte_protocol/v0/airbyte_protocol.yaml b/protocol-models/src/main/resources/airbyte_protocol/v0/airbyte_protocol.yaml index c8bb18e..6a45626 100644 --- a/protocol-models/src/main/resources/airbyte_protocol/v0/airbyte_protocol.yaml +++ b/protocol-models/src/main/resources/airbyte_protocol/v0/airbyte_protocol.yaml @@ -525,24 +525,24 @@ definitions: items: type: string generation_id: - description: + description: "Monotically increasing numeric id representing the current generation of a stream. This id can be shared across syncs. If this is null, it means that the platform is not supporting the refresh and it is expected that no extra id will be added to the records and no data from previous generation will be cleanup. " type: integer minimum_generation_id: - description: + description: "The minimum generation id which is needed in a stream. If it is present, the destination will try to delete the data that are part of a generation lower than this property. If the minimum generation is equals to 0, no data deletion is expected from the destiantion - + If this is null, it means that the platform is not supporting the refresh and it is expected that no extra id will be added to the records and no data from previous generation will be cleanup. " type: integer sync_id: - description: + description: "Monotically increasing numeric id representing the current sync id. This is aimed to be unique per sync. - + If this is null, it means that the platform is not supporting the refresh and it is expected that no extra id will be added to the records and no data from previous generation will be cleanup. " type: integer @@ -715,12 +715,12 @@ definitions: OAuth specific blob. Pertains to the fields defined by the connector relating to the OAuth flow. type: object additionalProperties: true - required: + required: - consent_url - access_token_url - extract_output properties: - consent_url: + consent_url: type: string description: |- The OAuth Specific string URL string template to initiate the authentication. @@ -730,7 +730,7 @@ definitions: { "consent_url": "https://domain.host.com/oauth2/authorize?{client_id_key}={{client_id_key}}&{redirect_uri_key}={urlEncoder:{{redirect_uri_key}}}&{scope_key}={urlEncoder:{{scope_key}}}&{state_key}={{state_key}}&subdomain={subdomain}" } - scope: + scope: type: string description: |- The OAuth Specific string of the scopes needed to be grant for authenticated user. @@ -739,7 +739,7 @@ definitions: { "scope": "user:read user:read_orders workspaces:read" } - access_token_url: + access_token_url: type: string description: |- The OAuth Specific URL templated string to obtain the `access_token`, `refresh_token` etc.