From 4c1db4f6a22f95e88d45feaea28126d29f5cc77f Mon Sep 17 00:00:00 2001 From: Haoran Sun Date: Wed, 27 Oct 2021 17:22:52 +0800 Subject: [PATCH 1/3] Change compressionType to type of object in ADF public swagger --- .../entityTypes/Dataset.json | 95 ++----------------- .../2020-12-01/entityTypes/Dataset.json | 95 ++----------------- 2 files changed, 12 insertions(+), 178 deletions(-) diff --git a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json index 8eaff42be9cc..f0ae949b559d 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/preview/2021-06-01-preview/entityTypes/Dataset.json @@ -397,13 +397,16 @@ ] }, "DatasetCompression": { - "discriminator": "type", "description": "The compression method used on a dataset.", "type": "object", "properties": { "type": { - "type": "string", - "description": "Type of dataset compression." + "type": "object", + "description": "Type of dataset compression. Type: string (or Expression with resultType string)." + }, + "level": { + "type": "object", + "description": "The dataset compression level. Type: string (or Expression with resultType string)." } }, "additionalProperties": { @@ -413,92 +416,6 @@ "type" ] }, - "DatasetBZip2Compression": { - "x-ms-discriminator-value": "BZip2", - "description": "The BZip2 compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": {} - }, - "DatasetGZipCompression": { - "x-ms-discriminator-value": "GZip", - "description": "The GZip compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": { - "level": { - "type": "object", - "description": "The GZip compression level. Type: string (or Expression with resultType string)." - } - } - }, - "DatasetDeflateCompression": { - "x-ms-discriminator-value": "Deflate", - "description": "The Deflate compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": { - "level": { - "type": "object", - "description": "The Deflate compression level. Type: string (or Expression with resultType string)." - } - } - }, - "DatasetZipDeflateCompression": { - "x-ms-discriminator-value": "ZipDeflate", - "description": "The ZipDeflate compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": { - "level": { - "type": "object", - "description": "The ZipDeflate compression level. Type: string (or Expression with resultType string)." - } - } - }, - "DatasetTarCompression": { - "x-ms-discriminator-value": "Tar", - "description": "The Tar archive method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": {} - }, - "DatasetTarGZipCompression": { - "x-ms-discriminator-value": "TarGZip", - "description": "The TarGZip compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": { - "level": { - "type": "object", - "description": "The TarGZip compression level. Type: string (or Expression with resultType string)." - } - } - }, "CompressionLevel": { "title": "Microsoft.Azure.Management.DataFactories.Models.CompressionLevel", "description": "All available compression levels.", diff --git a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Dataset.json b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Dataset.json index 6e0cd7995860..823de9c85de9 100644 --- a/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Dataset.json +++ b/specification/synapse/data-plane/Microsoft.Synapse/stable/2020-12-01/entityTypes/Dataset.json @@ -397,13 +397,16 @@ ] }, "DatasetCompression": { - "discriminator": "type", "description": "The compression method used on a dataset.", "type": "object", "properties": { "type": { - "type": "string", - "description": "Type of dataset compression." + "type": "object", + "description": "Type of dataset compression. Type: string (or Expression with resultType string)." + }, + "level": { + "type": "object", + "description": "The dataset compression level. Type: string (or Expression with resultType string)." } }, "additionalProperties": { @@ -413,92 +416,6 @@ "type" ] }, - "DatasetBZip2Compression": { - "x-ms-discriminator-value": "BZip2", - "description": "The BZip2 compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": {} - }, - "DatasetGZipCompression": { - "x-ms-discriminator-value": "GZip", - "description": "The GZip compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": { - "level": { - "type": "object", - "description": "The GZip compression level. Type: string (or Expression with resultType string)." - } - } - }, - "DatasetDeflateCompression": { - "x-ms-discriminator-value": "Deflate", - "description": "The Deflate compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": { - "level": { - "type": "object", - "description": "The Deflate compression level. Type: string (or Expression with resultType string)." - } - } - }, - "DatasetZipDeflateCompression": { - "x-ms-discriminator-value": "ZipDeflate", - "description": "The ZipDeflate compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": { - "level": { - "type": "object", - "description": "The ZipDeflate compression level. Type: string (or Expression with resultType string)." - } - } - }, - "DatasetTarCompression": { - "x-ms-discriminator-value": "Tar", - "description": "The Tar archive method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": {} - }, - "DatasetTarGZipCompression": { - "x-ms-discriminator-value": "TarGZip", - "description": "The TarGZip compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": { - "level": { - "type": "object", - "description": "The TarGZip compression level. Type: string (or Expression with resultType string)." - } - } - }, "CompressionLevel": { "title": "Microsoft.Azure.Management.DataFactories.Models.CompressionLevel", "description": "All available compression levels.", From af31b5ebfb6c5a51e9e7fdcd2b0e88342b0899e7 Mon Sep 17 00:00:00 2001 From: Haoran Sun Date: Thu, 28 Oct 2021 11:47:54 +0800 Subject: [PATCH 2/3] edit adf swagger --- .../2018-06-01/entityTypes/Dataset.json | 91 +------------------ 1 file changed, 4 insertions(+), 87 deletions(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json index f04316733701..bd1ed0203e09 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json @@ -446,13 +446,16 @@ ] }, "DatasetCompression": { - "discriminator": "type", "description": "The compression method used on a dataset.", "type": "object", "properties": { "type": { "type": "object", "description": "Type of dataset compression. Type: string (or Expression with resultType string)." + }, + "level": { + "type": "object", + "description": "The dataset compression level." } }, "additionalProperties": { @@ -462,92 +465,6 @@ "type" ] }, - "DatasetBZip2Compression": { - "x-ms-discriminator-value": "BZip2", - "description": "The BZip2 compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": {} - }, - "DatasetGZipCompression": { - "x-ms-discriminator-value": "GZip", - "description": "The GZip compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": { - "level": { - "type": "object", - "description": "The GZip compression level." - } - } - }, - "DatasetDeflateCompression": { - "x-ms-discriminator-value": "Deflate", - "description": "The Deflate compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": { - "level": { - "type": "object", - "description": "The Deflate compression level." - } - } - }, - "DatasetZipDeflateCompression": { - "x-ms-discriminator-value": "ZipDeflate", - "description": "The ZipDeflate compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": { - "level": { - "type": "object", - "description": "The ZipDeflate compression level." - } - } - }, - "DatasetTarCompression": { - "x-ms-discriminator-value": "Tar", - "description": "The Tar archive method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": {} - }, - "DatasetTarGZipCompression": { - "x-ms-discriminator-value": "TarGZip", - "description": "The TarGZip compression method used on a dataset.", - "type": "object", - "allOf": [ - { - "$ref": "#/definitions/DatasetCompression" - } - ], - "properties": { - "level": { - "type": "object", - "description": "The TarGZip compression level." - } - } - }, "CompressionLevel": { "title": "Microsoft.Azure.Management.DataFactories.Models.CompressionLevel", "description": "All available compression levels.", From f1fa3b0a04d75f2982a7d316b8e153f611ff0089 Mon Sep 17 00:00:00 2001 From: Haoran Sun Date: Fri, 29 Oct 2021 10:48:36 +0800 Subject: [PATCH 3/3] resolve comment --- .../stable/2018-06-01/entityTypes/Dataset.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json index bd1ed0203e09..3d207499b2e7 100644 --- a/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json +++ b/specification/datafactory/resource-manager/Microsoft.DataFactory/stable/2018-06-01/entityTypes/Dataset.json @@ -455,7 +455,7 @@ }, "level": { "type": "object", - "description": "The dataset compression level." + "description": "The dataset compression level. Type: string (or Expression with resultType string)." } }, "additionalProperties": {