diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Constants.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Constants.cs index 20f46a2adb67..f51cd6916c62 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Constants.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Constants.cs @@ -556,7 +556,7 @@ public static ContentModeratorClient GenerateClient(ReviewAPI api) { ContentModeratorClient client = new ContentModeratorClient(new ApiKeyServiceClientCredentials(ReviewAPISubscriptionKey)); - client.BaseUrl = "southeastasia.api.cognitive.microsoft.com"; + client.Endpoint = "https://southeastasia.api.cognitive.microsoft.com"; return client; @@ -572,8 +572,8 @@ public static ContentModeratorClient GenerateClient(ReviewAPI api, DelegatingHan try { ContentModeratorClient client = new ContentModeratorClient(new ApiKeyServiceClientCredentials(ReviewAPISubscriptionKey),handlers: handler); - - client.BaseUrl = "southeastasia.api.cognitive.microsoft.com"; + + client.Endpoint = "https://southeastasia.api.cognitive.microsoft.com"; return client; } @@ -822,7 +822,7 @@ public static ContentModeratorClient GenerateClient(ContentModeratorAPI api) try { ContentModeratorClient client = new ContentModeratorClient(new ApiKeyServiceClientCredentials(ContentModeratorSubscriptionKey)); - client.BaseUrl = AzureRegionBaseUrl.Southeastasiaapicognitivemicrosoftcom; + client.Endpoint = "https://southeastasia.api.cognitive.microsoft.com"; return client; } @@ -838,7 +838,7 @@ public static ContentModeratorClient GenerateClient(ContentModeratorAPI api, Del try { ContentModeratorClient client = new ContentModeratorClient(new ApiKeyServiceClientCredentials(ContentModeratorSubscriptionKey),handlers: handler); - client.BaseUrl = "southeastasia.api.cognitive.microsoft.com"; + client.Endpoint = "https://southeastasia.api.cognitive.microsoft.com"; return client; } @@ -872,10 +872,10 @@ public static Body GetListBody(Content c) Random r = new Random(); string num = r.Next(0,1000).ToString(); b.Name = $"BVT{c.GetDescription()}List" + num; - b.Description = $"BVT{c.GetDescription()}List" + num; - b.Metadata = new BodyMetadata(); - b.Metadata.KeyOne = $"BVT{c.GetDescription()}ListKeyNote1" + num; - b.Metadata.KeyTwo = $"BVT{c.GetDescription()}ListKeyNote2" + num; + b.Description = $"BVT{c.GetDescription()}List" + num; + b.Metadata = new Dictionary(); + b.Metadata["Key One"] = $"BVT{c.GetDescription()}ListKeyNote1" + num; + b.Metadata["Key Two"] = $"BVT{c.GetDescription()}ListKeyNote2" + num; return b; } catch (Exception e) diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Utilities.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Utilities.cs index 49094914bbb5..347149c727cd 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Utilities.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator.Tests/Helpers/Utilities.cs @@ -95,8 +95,8 @@ public static bool VerifyImageListContents(Body expected, ImageList actual) try { return expected.Name.Equals(actual.Name, StringComparison.InvariantCultureIgnoreCase) - && expected.Metadata.KeyOne.Equals(actual.Metadata.KeyOne, StringComparison.InvariantCultureIgnoreCase) - && expected.Metadata.KeyTwo.Equals(actual.Metadata.KeyTwo, StringComparison.InvariantCultureIgnoreCase); + && expected.Metadata["Key One"].Equals(actual.Metadata["Key One"], StringComparison.InvariantCultureIgnoreCase) + && expected.Metadata["Key Two"].Equals(actual.Metadata["Key Two"], StringComparison.InvariantCultureIgnoreCase); } catch (Exception e) { @@ -111,8 +111,8 @@ public static bool VerifyImageListContents(ImageList expected, ImageList actual) { return expected.Id == Convert.ToDouble(actual.Id) && expected.Name.Equals(actual.Name, StringComparison.InvariantCultureIgnoreCase) - && expected.Metadata.KeyOne.Equals(actual.Metadata.KeyOne, StringComparison.InvariantCultureIgnoreCase) - && expected.Metadata.KeyTwo.Equals(actual.Metadata.KeyTwo, StringComparison.InvariantCultureIgnoreCase); + && expected.Metadata["Key One"].Equals(actual.Metadata["Key One"], StringComparison.InvariantCultureIgnoreCase) + && expected.Metadata["Key Two"].Equals(actual.Metadata["Key Two"], StringComparison.InvariantCultureIgnoreCase); } catch (Exception e) { @@ -126,8 +126,8 @@ public static bool VerifyTermListContents(Body expected, TermList actual) try { return expected.Name.Equals(actual.Name, StringComparison.InvariantCultureIgnoreCase) - && expected.Metadata.KeyOne.Equals(actual.Metadata.KeyOne, StringComparison.InvariantCultureIgnoreCase) - && expected.Metadata.KeyTwo.Equals(actual.Metadata.KeyTwo, StringComparison.InvariantCultureIgnoreCase); + && expected.Metadata["Key One"].Equals(actual.Metadata["Key One"], StringComparison.InvariantCultureIgnoreCase) + && expected.Metadata["Key Two"].Equals(actual.Metadata["Key Two"], StringComparison.InvariantCultureIgnoreCase); } catch (Exception e) { @@ -142,8 +142,8 @@ public static bool VerifyTermListContents(TermList expected, TermList actual) { return expected.Id == Convert.ToDouble(actual.Id) && expected.Name.Equals(actual.Name, StringComparison.InvariantCultureIgnoreCase) - && expected.Metadata.KeyOne.Equals(actual.Metadata.KeyOne, StringComparison.InvariantCultureIgnoreCase) - && expected.Metadata.KeyTwo.Equals(actual.Metadata.KeyTwo, StringComparison.InvariantCultureIgnoreCase); + && expected.Metadata["Key One"].Equals(actual.Metadata["Key One"], StringComparison.InvariantCultureIgnoreCase) + && expected.Metadata["Key Two"].Equals(actual.Metadata["Key Two"], StringComparison.InvariantCultureIgnoreCase); } catch (Exception e) { diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ContentModeratorClient.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ContentModeratorClient.cs index 6770cfa912c8..c1f9f7b4cba3 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ContentModeratorClient.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ContentModeratorClient.cs @@ -27,14 +27,6 @@ namespace Microsoft.CognitiveServices.ContentModerator /// Text can be at most 1024 characters long. /// If the content passed to the text API or the image API exceeds the size /// limits, the API will return an error code that informs about the issue. - /// - /// This API is currently available in: - /// - /// * West US - westus.api.cognitive.microsoft.com - /// * East US 2 - eastus2.api.cognitive.microsoft.com - /// * West Central US - westcentralus.api.cognitive.microsoft.com - /// * West Europe - westeurope.api.cognitive.microsoft.com - /// * Southeast Asia - southeastasia.api.cognitive.microsoft.com . /// public partial class ContentModeratorClient : ServiceClient, IContentModeratorClient { @@ -54,22 +46,10 @@ public partial class ContentModeratorClient : ServiceClient - /// Supported Azure regions for Content Moderator endpoints. Possible values - /// include: 'westus.api.cognitive.microsoft.com', - /// 'westus2.api.cognitive.microsoft.com', - /// 'eastus.api.cognitive.microsoft.com', - /// 'eastus2.api.cognitive.microsoft.com', - /// 'westcentralus.api.cognitive.microsoft.com', - /// 'southcentralus.api.cognitive.microsoft.com', - /// 'westeurope.api.cognitive.microsoft.com', - /// 'northeurope.api.cognitive.microsoft.com', - /// 'southeastasia.api.cognitive.microsoft.com', - /// 'eastasia.api.cognitive.microsoft.com', - /// 'australiaeast.api.cognitive.microsoft.com', - /// 'brazilsouth.api.cognitive.microsoft.com', - /// 'contentmoderatortest.azure-api.net' + /// Supported Cognitive Services endpoints (protocol and hostname, for example: + /// https://westus.api.cognitive.microsoft.com). /// - public string BaseUrl { get; set; } + public string Endpoint { get; set; } /// /// Subscription credentials which uniquely identify client subscription. @@ -111,6 +91,19 @@ public partial class ContentModeratorClient : ServiceClient public virtual IReviews Reviews { get; private set; } + /// + /// Initializes a new instance of the ContentModeratorClient class. + /// + /// + /// HttpClient to be used + /// + /// + /// True: will dispose the provided httpClient on calling ContentModeratorClient.Dispose(). False: will not dispose provided httpClient + protected ContentModeratorClient(HttpClient httpClient, bool disposeHttpClient) : base(httpClient, disposeHttpClient) + { + Initialize(); + } + /// /// Initializes a new instance of the ContentModeratorClient class. /// @@ -161,6 +154,33 @@ public ContentModeratorClient(ServiceClientCredentials credentials, params Deleg } } + /// + /// Initializes a new instance of the ContentModeratorClient class. + /// + /// + /// Required. Subscription credentials which uniquely identify client subscription. + /// + /// + /// HttpClient to be used + /// + /// + /// True: will dispose the provided httpClient on calling ContentModeratorClient.Dispose(). False: will not dispose provided httpClient + /// + /// Thrown when a required parameter is null + /// + public ContentModeratorClient(ServiceClientCredentials credentials, HttpClient httpClient, bool disposeHttpClient) : this(httpClient, disposeHttpClient) + { + if (credentials == null) + { + throw new System.ArgumentNullException("credentials"); + } + Credentials = credentials; + if (Credentials != null) + { + Credentials.InitializeServiceClient(this); + } + } + /// /// Initializes a new instance of the ContentModeratorClient class. /// @@ -205,7 +225,7 @@ private void Initialize() ListManagementImage = new ListManagementImage(this); ListManagementTerm = new ListManagementTerm(this); Reviews = new Reviews(this); - BaseUri = "https://{baseUrl}"; + BaseUri = "{Endpoint}"; SerializationSettings = new JsonSerializerSettings { Formatting = Newtonsoft.Json.Formatting.Indented, diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/IContentModeratorClient.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/IContentModeratorClient.cs index 9c2b8852adc6..4862b6d096de 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/IContentModeratorClient.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/IContentModeratorClient.cs @@ -22,14 +22,6 @@ namespace Microsoft.CognitiveServices.ContentModerator /// Text can be at most 1024 characters long. /// If the content passed to the text API or the image API exceeds the size /// limits, the API will return an error code that informs about the issue. - /// - /// This API is currently available in: - /// - /// * West US - westus.api.cognitive.microsoft.com - /// * East US 2 - eastus2.api.cognitive.microsoft.com - /// * West Central US - westcentralus.api.cognitive.microsoft.com - /// * West Europe - westeurope.api.cognitive.microsoft.com - /// * Southeast Asia - southeastasia.api.cognitive.microsoft.com . /// public partial interface IContentModeratorClient : System.IDisposable { @@ -48,22 +40,10 @@ public partial interface IContentModeratorClient : System.IDisposable JsonSerializerSettings DeserializationSettings { get; } /// - /// Supported Azure regions for Content Moderator endpoints. Possible - /// values include: 'westus.api.cognitive.microsoft.com', - /// 'westus2.api.cognitive.microsoft.com', - /// 'eastus.api.cognitive.microsoft.com', - /// 'eastus2.api.cognitive.microsoft.com', - /// 'westcentralus.api.cognitive.microsoft.com', - /// 'southcentralus.api.cognitive.microsoft.com', - /// 'westeurope.api.cognitive.microsoft.com', - /// 'northeurope.api.cognitive.microsoft.com', - /// 'southeastasia.api.cognitive.microsoft.com', - /// 'eastasia.api.cognitive.microsoft.com', - /// 'australiaeast.api.cognitive.microsoft.com', - /// 'brazilsouth.api.cognitive.microsoft.com', - /// 'contentmoderatortest.azure-api.net' + /// Supported Cognitive Services endpoints (protocol and hostname, for + /// example: https://westus.api.cognitive.microsoft.com). /// - string BaseUrl { get; set; } + string Endpoint { get; set; } /// /// Subscription credentials which uniquely identify client diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ImageModeration.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ImageModeration.cs index f5c61fde846c..1bdc9b6d8d08 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ImageModeration.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ImageModeration.cs @@ -76,9 +76,9 @@ public ImageModeration(ContentModeratorClient client) /// public async Task> FindFacesWithHttpMessagesAsync(bool? cacheImage = default(bool?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; @@ -94,7 +94,7 @@ public ImageModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessImage/FindFaces"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); List _queryParameters = new List(); if (cacheImage != null) { @@ -246,9 +246,9 @@ public ImageModeration(ContentModeratorClient client) /// public async Task> OCRMethodWithHttpMessagesAsync(string language, bool? cacheImage = default(bool?), bool? enhanced = false, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (language == null) { @@ -270,7 +270,7 @@ public ImageModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessImage/OCR"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); List _queryParameters = new List(); if (language != null) { @@ -418,9 +418,9 @@ public ImageModeration(ContentModeratorClient client) /// public async Task> EvaluateMethodWithHttpMessagesAsync(bool? cacheImage = default(bool?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; @@ -436,7 +436,7 @@ public ImageModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessImage/Evaluate"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); List _queryParameters = new List(); if (cacheImage != null) { @@ -587,9 +587,9 @@ public ImageModeration(ContentModeratorClient client) /// public async Task> MatchMethodWithHttpMessagesAsync(string listId = default(string), bool? cacheImage = default(bool?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; @@ -606,7 +606,7 @@ public ImageModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessImage/Match"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); List _queryParameters = new List(); if (listId != null) { @@ -753,9 +753,9 @@ public ImageModeration(ContentModeratorClient client) /// public async Task> FindFacesFileInputWithHttpMessagesAsync(Stream imageStream, bool? cacheImage = default(bool?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (imageStream == null) { @@ -776,7 +776,7 @@ public ImageModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessImage/FindFaces"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); List _queryParameters = new List(); if (cacheImage != null) { @@ -931,9 +931,9 @@ public ImageModeration(ContentModeratorClient client) /// public async Task> FindFacesUrlInputWithHttpMessagesAsync(string contentType, BodyModel imageUrl, bool? cacheImage = default(bool?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (contentType == null) { @@ -959,7 +959,7 @@ public ImageModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessImage/FindFaces"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); List _queryParameters = new List(); if (cacheImage != null) { @@ -1123,9 +1123,9 @@ public ImageModeration(ContentModeratorClient client) /// public async Task> OCRUrlInputWithHttpMessagesAsync(string language, string contentType, BodyModel imageUrl, bool? cacheImage = default(bool?), bool? enhanced = false, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (language == null) { @@ -1157,7 +1157,7 @@ public ImageModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessImage/OCR"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); List _queryParameters = new List(); if (language != null) { @@ -1326,9 +1326,9 @@ public ImageModeration(ContentModeratorClient client) /// public async Task> OCRFileInputWithHttpMessagesAsync(string language, Stream imageStream, bool? cacheImage = default(bool?), bool? enhanced = false, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (language == null) { @@ -1355,7 +1355,7 @@ public ImageModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessImage/OCR"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); List _queryParameters = new List(); if (language != null) { @@ -1515,9 +1515,9 @@ public ImageModeration(ContentModeratorClient client) /// public async Task> EvaluateFileInputWithHttpMessagesAsync(Stream imageStream, bool? cacheImage = default(bool?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (imageStream == null) { @@ -1538,7 +1538,7 @@ public ImageModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessImage/Evaluate"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); List _queryParameters = new List(); if (cacheImage != null) { @@ -1693,9 +1693,9 @@ public ImageModeration(ContentModeratorClient client) /// public async Task> EvaluateUrlInputWithHttpMessagesAsync(string contentType, BodyModel imageUrl, bool? cacheImage = default(bool?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (contentType == null) { @@ -1721,7 +1721,7 @@ public ImageModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessImage/Evaluate"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); List _queryParameters = new List(); if (cacheImage != null) { @@ -1884,9 +1884,9 @@ public ImageModeration(ContentModeratorClient client) /// public async Task> MatchUrlInputWithHttpMessagesAsync(string contentType, BodyModel imageUrl, string listId = default(string), bool? cacheImage = default(bool?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (contentType == null) { @@ -1913,7 +1913,7 @@ public ImageModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessImage/Match"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); List _queryParameters = new List(); if (listId != null) { @@ -2077,9 +2077,9 @@ public ImageModeration(ContentModeratorClient client) /// public async Task> MatchFileInputWithHttpMessagesAsync(Stream imageStream, string listId = default(string), bool? cacheImage = default(bool?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (imageStream == null) { @@ -2101,7 +2101,7 @@ public ImageModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessImage/Match"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); List _queryParameters = new List(); if (listId != null) { diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementImage.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementImage.cs index 3c3fa33e55cc..7bb4f04bbb26 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementImage.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementImage.cs @@ -81,9 +81,9 @@ public ListManagementImage(ContentModeratorClient client) /// public async Task> AddImageWithHttpMessagesAsync(string listId, int? tag = default(int?), string label = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -105,7 +105,7 @@ public ListManagementImage(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/imagelists/{listId}/images"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); List _queryParameters = new List(); if (tag != null) @@ -249,9 +249,9 @@ public ListManagementImage(ContentModeratorClient client) /// public async Task> DeleteAllImagesWithHttpMessagesAsync(string listId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -271,7 +271,7 @@ public ListManagementImage(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/imagelists/{listId}/images"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); @@ -402,9 +402,9 @@ public ListManagementImage(ContentModeratorClient client) /// public async Task> GetAllImageIdsWithHttpMessagesAsync(string listId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -424,7 +424,7 @@ public ListManagementImage(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/imagelists/{listId}/images"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); @@ -558,9 +558,9 @@ public ListManagementImage(ContentModeratorClient client) /// public async Task> DeleteImageWithHttpMessagesAsync(string listId, string imageId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -585,7 +585,7 @@ public ListManagementImage(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/imagelists/{listId}/images/{ImageId}"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); _url = _url.Replace("{ImageId}", System.Uri.EscapeDataString(imageId)); // Create HTTP transport objects @@ -729,9 +729,9 @@ public ListManagementImage(ContentModeratorClient client) /// public async Task> AddImageUrlInputWithHttpMessagesAsync(string listId, string contentType, BodyModel imageUrl, int? tag = default(int?), string label = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -763,7 +763,7 @@ public ListManagementImage(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/imagelists/{listId}/images"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); List _queryParameters = new List(); if (tag != null) @@ -922,9 +922,9 @@ public ListManagementImage(ContentModeratorClient client) /// public async Task> AddImageFileInputWithHttpMessagesAsync(string listId, Stream imageStream, int? tag = default(int?), string label = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -951,7 +951,7 @@ public ListManagementImage(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/imagelists/{listId}/images"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); List _queryParameters = new List(); if (tag != null) diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementImageLists.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementImageLists.cs index 7581b9a57e5d..70a2dccf4284 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementImageLists.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementImageLists.cs @@ -75,9 +75,9 @@ public ListManagementImageLists(ContentModeratorClient client) /// public async Task> GetDetailsWithHttpMessagesAsync(string listId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -97,7 +97,7 @@ public ListManagementImageLists(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/imagelists/{listId}"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); @@ -228,9 +228,9 @@ public ListManagementImageLists(ContentModeratorClient client) /// public async Task> DeleteWithHttpMessagesAsync(string listId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -250,7 +250,7 @@ public ListManagementImageLists(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/imagelists/{listId}"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); @@ -387,9 +387,9 @@ public ListManagementImageLists(ContentModeratorClient client) /// public async Task> UpdateWithHttpMessagesAsync(string listId, string contentType, Body body, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -419,7 +419,7 @@ public ListManagementImageLists(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/imagelists/{listId}"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); @@ -559,9 +559,9 @@ public ListManagementImageLists(ContentModeratorClient client) /// public async Task> CreateWithHttpMessagesAsync(string contentType, Body body, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (contentType == null) { @@ -586,7 +586,7 @@ public ListManagementImageLists(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/imagelists"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); HttpResponseMessage _httpResponse = null; @@ -719,9 +719,9 @@ public ListManagementImageLists(ContentModeratorClient client) /// public async Task>> GetAllImageListsWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; @@ -736,7 +736,7 @@ public ListManagementImageLists(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/imagelists"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); HttpResponseMessage _httpResponse = null; @@ -866,9 +866,9 @@ public ListManagementImageLists(ContentModeratorClient client) /// public async Task> RefreshIndexMethodWithHttpMessagesAsync(string listId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -888,7 +888,7 @@ public ListManagementImageLists(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/imagelists/{listId}/RefreshIndex"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementTerm.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementTerm.cs index f7d5a5cca4aa..87261fa6b253 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementTerm.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementTerm.cs @@ -81,9 +81,9 @@ public ListManagementTerm(ContentModeratorClient client) /// public async Task> AddTermWithHttpMessagesAsync(string listId, string term, string language, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -113,7 +113,7 @@ public ListManagementTerm(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/termlists/{listId}/terms/{term}"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); _url = _url.Replace("{term}", System.Uri.EscapeDataString(term)); List _queryParameters = new List(); @@ -260,9 +260,9 @@ public ListManagementTerm(ContentModeratorClient client) /// public async Task> DeleteTermWithHttpMessagesAsync(string listId, string term, string language, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -292,7 +292,7 @@ public ListManagementTerm(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/termlists/{listId}/terms/{term}"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); _url = _url.Replace("{term}", System.Uri.EscapeDataString(term)); List _queryParameters = new List(); @@ -442,9 +442,9 @@ public ListManagementTerm(ContentModeratorClient client) /// public async Task> GetAllTermsWithHttpMessagesAsync(string listId, string language, int? offset = default(int?), int? limit = default(int?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -471,7 +471,7 @@ public ListManagementTerm(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/termlists/{listId}/terms"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); List _queryParameters = new List(); if (language != null) @@ -622,9 +622,9 @@ public ListManagementTerm(ContentModeratorClient client) /// public async Task> DeleteAllTermsWithHttpMessagesAsync(string listId, string language, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -649,7 +649,7 @@ public ListManagementTerm(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/termlists/{listId}/terms"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); List _queryParameters = new List(); if (language != null) diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementTermLists.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementTermLists.cs index a7bd4150acc4..0eb2e2a830b5 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementTermLists.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/ListManagementTermLists.cs @@ -76,9 +76,9 @@ public ListManagementTermLists(ContentModeratorClient client) /// public async Task> GetDetailsWithHttpMessagesAsync(string listId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -98,7 +98,7 @@ public ListManagementTermLists(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/termlists/{listId}"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); @@ -229,9 +229,9 @@ public ListManagementTermLists(ContentModeratorClient client) /// public async Task> DeleteWithHttpMessagesAsync(string listId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -251,7 +251,7 @@ public ListManagementTermLists(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/termlists/{listId}"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); @@ -388,9 +388,9 @@ public ListManagementTermLists(ContentModeratorClient client) /// public async Task> UpdateWithHttpMessagesAsync(string listId, string contentType, Body body, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -420,7 +420,7 @@ public ListManagementTermLists(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/termlists/{listId}"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); @@ -560,9 +560,9 @@ public ListManagementTermLists(ContentModeratorClient client) /// public async Task> CreateWithHttpMessagesAsync(string contentType, Body body, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (contentType == null) { @@ -587,7 +587,7 @@ public ListManagementTermLists(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/termlists"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); HttpResponseMessage _httpResponse = null; @@ -720,9 +720,9 @@ public ListManagementTermLists(ContentModeratorClient client) /// public async Task>> GetAllTermListsWithHttpMessagesAsync(Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } // Tracing bool _shouldTrace = ServiceClientTracing.IsEnabled; @@ -737,7 +737,7 @@ public ListManagementTermLists(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/termlists"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); HttpResponseMessage _httpResponse = null; @@ -870,9 +870,9 @@ public ListManagementTermLists(ContentModeratorClient client) /// public async Task> RefreshIndexMethodWithHttpMessagesAsync(string listId, string language, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (listId == null) { @@ -897,7 +897,7 @@ public ListManagementTermLists(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/lists/v1.0/termlists/{listId}/RefreshIndex"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{listId}", System.Uri.EscapeDataString(listId)); List _queryParameters = new List(); if (language != null) diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/AzureRegionBaseUrl.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/AzureRegionBaseUrl.cs deleted file mode 100644 index 9e78cd24bc89..000000000000 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/AzureRegionBaseUrl.cs +++ /dev/null @@ -1,29 +0,0 @@ -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.CognitiveServices.ContentModerator.Models -{ - - /// - /// Defines values for AzureRegionBaseUrl. - /// - public static class AzureRegionBaseUrl - { - public const string Westusapicognitivemicrosoftcom = "westus.api.cognitive.microsoft.com"; - public const string Westus2apicognitivemicrosoftcom = "westus2.api.cognitive.microsoft.com"; - public const string Eastusapicognitivemicrosoftcom = "eastus.api.cognitive.microsoft.com"; - public const string Eastus2apicognitivemicrosoftcom = "eastus2.api.cognitive.microsoft.com"; - public const string Westcentralusapicognitivemicrosoftcom = "westcentralus.api.cognitive.microsoft.com"; - public const string Southcentralusapicognitivemicrosoftcom = "southcentralus.api.cognitive.microsoft.com"; - public const string Westeuropeapicognitivemicrosoftcom = "westeurope.api.cognitive.microsoft.com"; - public const string Northeuropeapicognitivemicrosoftcom = "northeurope.api.cognitive.microsoft.com"; - public const string Southeastasiaapicognitivemicrosoftcom = "southeastasia.api.cognitive.microsoft.com"; - public const string Eastasiaapicognitivemicrosoftcom = "eastasia.api.cognitive.microsoft.com"; - public const string Australiaeastapicognitivemicrosoftcom = "australiaeast.api.cognitive.microsoft.com"; - public const string Brazilsouthapicognitivemicrosoftcom = "brazilsouth.api.cognitive.microsoft.com"; - public const string ContentmoderatortestazureApinet = "contentmoderatortest.azure-api.net"; - } -} diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/Body.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/Body.cs index 37c4dc2505af..9617227b20c7 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/Body.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/Body.cs @@ -7,6 +7,8 @@ namespace Microsoft.CognitiveServices.ContentModerator.Models { using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; using System.Linq; public partial class Body @@ -25,7 +27,7 @@ public Body() /// Name of the list. /// Description of the list. /// Metadata of the list. - public Body(string name = default(string), string description = default(string), BodyMetadata metadata = default(BodyMetadata)) + public Body(string name = default(string), string description = default(string), IDictionary metadata = default(IDictionary)) { Name = name; Description = description; @@ -54,7 +56,7 @@ public Body() /// Gets or sets metadata of the list. /// [JsonProperty(PropertyName = "Metadata")] - public BodyMetadata Metadata { get; set; } + public IDictionary Metadata { get; set; } } } diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/BodyMetadata.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/BodyMetadata.cs deleted file mode 100644 index e94b43f73537..000000000000 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/BodyMetadata.cs +++ /dev/null @@ -1,57 +0,0 @@ -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.CognitiveServices.ContentModerator.Models -{ - using Newtonsoft.Json; - using System.Linq; - - /// - /// Metadata of the list. - /// - public partial class BodyMetadata - { - /// - /// Initializes a new instance of the BodyMetadata class. - /// - public BodyMetadata() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the BodyMetadata class. - /// - /// Optional key value pair to describe your - /// list. - /// Optional key value pair to describe your - /// list. - public BodyMetadata(string keyOne = default(string), string keyTwo = default(string)) - { - KeyOne = keyOne; - KeyTwo = keyTwo; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets optional key value pair to describe your list. - /// - [JsonProperty(PropertyName = "Key One")] - public string KeyOne { get; set; } - - /// - /// Gets or sets optional key value pair to describe your list. - /// - [JsonProperty(PropertyName = "Key Two")] - public string KeyTwo { get; set; } - - } -} diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ImageList.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ImageList.cs index 50d2d9e7bca8..f214733ed211 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ImageList.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ImageList.cs @@ -7,6 +7,8 @@ namespace Microsoft.CognitiveServices.ContentModerator.Models { using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; using System.Linq; /// @@ -29,7 +31,7 @@ public ImageList() /// Image List Name. /// Description for image list. /// Image List Metadata. - public ImageList(int? id = default(int?), string name = default(string), string description = default(string), ImageListMetadata metadata = default(ImageListMetadata)) + public ImageList(int? id = default(int?), string name = default(string), string description = default(string), IDictionary metadata = default(IDictionary)) { Id = id; Name = name; @@ -65,7 +67,7 @@ public ImageList() /// Gets or sets image List Metadata. /// [JsonProperty(PropertyName = "Metadata")] - public ImageListMetadata Metadata { get; set; } + public IDictionary Metadata { get; set; } } } diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ImageListMetadata.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ImageListMetadata.cs deleted file mode 100644 index 9444ff7e1937..000000000000 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/ImageListMetadata.cs +++ /dev/null @@ -1,57 +0,0 @@ -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.CognitiveServices.ContentModerator.Models -{ - using Newtonsoft.Json; - using System.Linq; - - /// - /// Image List Metadata. - /// - public partial class ImageListMetadata - { - /// - /// Initializes a new instance of the ImageListMetadata class. - /// - public ImageListMetadata() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the ImageListMetadata class. - /// - /// Optional Key value pair to describe your - /// list. - /// Optional Key value pair to describe your - /// list. - public ImageListMetadata(string keyOne = default(string), string keyTwo = default(string)) - { - KeyOne = keyOne; - KeyTwo = keyTwo; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets optional Key value pair to describe your list. - /// - [JsonProperty(PropertyName = "Key One")] - public string KeyOne { get; set; } - - /// - /// Gets or sets optional Key value pair to describe your list. - /// - [JsonProperty(PropertyName = "Key Two")] - public string KeyTwo { get; set; } - - } -} diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/RefreshIndex.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/RefreshIndex.cs index 7135e9505bda..99106d354641 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/RefreshIndex.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/RefreshIndex.cs @@ -32,7 +32,7 @@ public RefreshIndex() /// Advanced info list. /// Refresh index status. /// Tracking Id. - public RefreshIndex(string contentSourceId = default(string), bool? isUpdateSuccess = default(bool?), IList advancedInfo = default(IList), Status status = default(Status), string trackingId = default(string)) + public RefreshIndex(string contentSourceId = default(string), bool? isUpdateSuccess = default(bool?), IList> advancedInfo = default(IList>), Status status = default(Status), string trackingId = default(string)) { ContentSourceId = contentSourceId; IsUpdateSuccess = isUpdateSuccess; @@ -63,7 +63,7 @@ public RefreshIndex() /// Gets or sets advanced info list. /// [JsonProperty(PropertyName = "AdvancedInfo")] - public IList AdvancedInfo { get; set; } + public IList> AdvancedInfo { get; set; } /// /// Gets or sets refresh index status. diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/RefreshIndexAdvancedInfoItem.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/RefreshIndexAdvancedInfoItem.cs deleted file mode 100644 index d7c56681145e..000000000000 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/RefreshIndexAdvancedInfoItem.cs +++ /dev/null @@ -1,56 +0,0 @@ -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.CognitiveServices.ContentModerator.Models -{ - using Newtonsoft.Json; - using System.Linq; - - public partial class RefreshIndexAdvancedInfoItem - { - /// - /// Initializes a new instance of the RefreshIndexAdvancedInfoItem - /// class. - /// - public RefreshIndexAdvancedInfoItem() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the RefreshIndexAdvancedInfoItem - /// class. - /// - /// Key parameter to describe advanced - /// info. - /// Key parameter to describe advanced - /// info. - public RefreshIndexAdvancedInfoItem(string keyOne = default(string), string keyTwo = default(string)) - { - KeyOne = keyOne; - KeyTwo = keyTwo; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets key parameter to describe advanced info. - /// - [JsonProperty(PropertyName = "Key One")] - public string KeyOne { get; set; } - - /// - /// Gets or sets key parameter to describe advanced info. - /// - [JsonProperty(PropertyName = "Key Two")] - public string KeyTwo { get; set; } - - } -} diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/TermList.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/TermList.cs index 197cb567b572..3fd20d12ba81 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/TermList.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/TermList.cs @@ -7,6 +7,8 @@ namespace Microsoft.CognitiveServices.ContentModerator.Models { using Newtonsoft.Json; + using System.Collections; + using System.Collections.Generic; using System.Linq; /// @@ -29,7 +31,7 @@ public TermList() /// Term list name. /// Description for term list. /// Term list metadata. - public TermList(int? id = default(int?), string name = default(string), string description = default(string), TermListMetadata metadata = default(TermListMetadata)) + public TermList(int? id = default(int?), string name = default(string), string description = default(string), IDictionary metadata = default(IDictionary)) { Id = id; Name = name; @@ -65,7 +67,7 @@ public TermList() /// Gets or sets term list metadata. /// [JsonProperty(PropertyName = "Metadata")] - public TermListMetadata Metadata { get; set; } + public IDictionary Metadata { get; set; } } } diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/TermListMetadata.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/TermListMetadata.cs deleted file mode 100644 index deaff4869333..000000000000 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Models/TermListMetadata.cs +++ /dev/null @@ -1,57 +0,0 @@ -// -// Code generated by Microsoft (R) AutoRest Code Generator. -// Changes may cause incorrect behavior and will be lost if the code is -// regenerated. -// - -namespace Microsoft.CognitiveServices.ContentModerator.Models -{ - using Newtonsoft.Json; - using System.Linq; - - /// - /// Term list metadata. - /// - public partial class TermListMetadata - { - /// - /// Initializes a new instance of the TermListMetadata class. - /// - public TermListMetadata() - { - CustomInit(); - } - - /// - /// Initializes a new instance of the TermListMetadata class. - /// - /// Optional Key value pair to describe your - /// list. - /// Optional Key value pair to describe your - /// list. - public TermListMetadata(string keyOne = default(string), string keyTwo = default(string)) - { - KeyOne = keyOne; - KeyTwo = keyTwo; - CustomInit(); - } - - /// - /// An initialization method that performs custom operations like setting defaults - /// - partial void CustomInit(); - - /// - /// Gets or sets optional Key value pair to describe your list. - /// - [JsonProperty(PropertyName = "Key One")] - public string KeyOne { get; set; } - - /// - /// Gets or sets optional Key value pair to describe your list. - /// - [JsonProperty(PropertyName = "Key Two")] - public string KeyTwo { get; set; } - - } -} diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Reviews.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Reviews.cs index fa60ef23c12d..f1ebd276ddb2 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Reviews.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/Reviews.cs @@ -79,9 +79,9 @@ public Reviews(ContentModeratorClient client) /// public async Task> GetReviewWithHttpMessagesAsync(string teamName, string reviewId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (teamName == null) { @@ -106,7 +106,7 @@ public Reviews(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/review/v1.0/teams/{teamName}/reviews/{reviewId}"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{teamName}", System.Uri.EscapeDataString(teamName)); _url = _url.Replace("{reviewId}", System.Uri.EscapeDataString(reviewId)); // Create HTTP transport objects @@ -241,9 +241,9 @@ public Reviews(ContentModeratorClient client) /// public async Task> GetJobDetailsWithHttpMessagesAsync(string teamName, string jobId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (teamName == null) { @@ -268,7 +268,7 @@ public Reviews(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/review/v1.0/teams/{teamName}/jobs/{JobId}"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{teamName}", System.Uri.EscapeDataString(teamName)); _url = _url.Replace("{JobId}", System.Uri.EscapeDataString(jobId)); // Create HTTP transport objects @@ -434,9 +434,9 @@ public Reviews(ContentModeratorClient client) /// public async Task>> CreateReviewsWithHttpMessagesAsync(string urlContentType, string teamName, IList createReviewBody, string subTeam = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (urlContentType == null) { @@ -477,7 +477,7 @@ public Reviews(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/review/v1.0/teams/{teamName}/reviews"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{teamName}", System.Uri.EscapeDataString(teamName)); List _queryParameters = new List(); if (subTeam != null) @@ -700,9 +700,9 @@ public Reviews(ContentModeratorClient client) /// public async Task> CreateJobWithHttpMessagesAsync(string teamName, string contentType, string contentId, string workflowName, string jobContentType, Content content, string callBackEndpoint = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (teamName == null) { @@ -752,12 +752,12 @@ public Reviews(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/review/v1.0/teams/{teamName}/jobs"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{teamName}", System.Uri.EscapeDataString(teamName)); List _queryParameters = new List(); if (contentType != null) { - _queryParameters.Add(string.Format("ContentType={0}", System.Uri.EscapeDataString(contentType))); + _queryParameters.Add(string.Format("ContentType={0}", System.Uri.EscapeDataString(Rest.Serialization.SafeJsonConvert.SerializeObject(contentType, Client.SerializationSettings).Trim('"')))); } if (contentId != null) { @@ -938,9 +938,9 @@ public Reviews(ContentModeratorClient client) /// public async Task AddVideoFrameWithHttpMessagesAsync(string teamName, string reviewId, int? timescale = default(int?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (teamName == null) { @@ -966,7 +966,7 @@ public Reviews(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/review/v1.0/teams/{teamName}/reviews/{reviewId}/frames"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{teamName}", System.Uri.EscapeDataString(teamName)); _url = _url.Replace("{reviewId}", System.Uri.EscapeDataString(reviewId)); List _queryParameters = new List(); @@ -1126,9 +1126,9 @@ public Reviews(ContentModeratorClient client) /// public async Task> GetVideoFramesWithHttpMessagesAsync(string teamName, string reviewId, int? startSeed = default(int?), int? noOfRecords = default(int?), string filter = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (teamName == null) { @@ -1156,7 +1156,7 @@ public Reviews(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/review/v1.0/teams/{teamName}/reviews/{reviewId}/frames"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{teamName}", System.Uri.EscapeDataString(teamName)); _url = _url.Replace("{reviewId}", System.Uri.EscapeDataString(reviewId)); List _queryParameters = new List(); @@ -1305,9 +1305,9 @@ public Reviews(ContentModeratorClient client) /// public async Task PublishVideoReviewWithHttpMessagesAsync(string teamName, string reviewId, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (teamName == null) { @@ -1332,7 +1332,7 @@ public Reviews(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/review/v1.0/teams/{teamName}/reviews/{reviewId}/publish"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{teamName}", System.Uri.EscapeDataString(teamName)); _url = _url.Replace("{reviewId}", System.Uri.EscapeDataString(reviewId)); // Create HTTP transport objects @@ -1455,9 +1455,9 @@ public Reviews(ContentModeratorClient client) /// public async Task AddVideoTranscriptModerationResultWithHttpMessagesAsync(string contentType, string teamName, string reviewId, IList transcriptModerationBody, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (contentType == null) { @@ -1502,7 +1502,7 @@ public Reviews(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/review/v1.0/teams/{teamName}/reviews/{reviewId}/transcriptmoderationresult"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{teamName}", System.Uri.EscapeDataString(teamName)); _url = _url.Replace("{reviewId}", System.Uri.EscapeDataString(reviewId)); // Create HTTP transport objects @@ -1626,9 +1626,9 @@ public Reviews(ContentModeratorClient client) /// public async Task AddVideoTranscriptWithHttpMessagesAsync(string teamName, string reviewId, Stream vTTfile, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (teamName == null) { @@ -1660,7 +1660,7 @@ public Reviews(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/review/v1.0/teams/{teamName}/reviews/{reviewId}/transcript"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{teamName}", System.Uri.EscapeDataString(teamName)); _url = _url.Replace("{reviewId}", System.Uri.EscapeDataString(reviewId)); // Create HTTP transport objects @@ -1817,9 +1817,9 @@ public Reviews(ContentModeratorClient client) /// public async Task>> CreateVideoReviewsWithHttpMessagesAsync(string contentType, string teamName, IList createVideoReviewsBody, string subTeam = default(string), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (contentType == null) { @@ -1860,7 +1860,7 @@ public Reviews(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/review/v1.0/teams/{teamName}/reviews"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{teamName}", System.Uri.EscapeDataString(teamName)); List _queryParameters = new List(); if (subTeam != null) @@ -2019,9 +2019,9 @@ public Reviews(ContentModeratorClient client) /// public async Task AddVideoFrameUrlWithHttpMessagesAsync(string contentType, string teamName, string reviewId, IList videoFrameBody, int? timescale = default(int?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (contentType == null) { @@ -2067,7 +2067,7 @@ public Reviews(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/review/v1.0/teams/{teamName}/reviews/{reviewId}/frames"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{teamName}", System.Uri.EscapeDataString(teamName)); _url = _url.Replace("{reviewId}", System.Uri.EscapeDataString(reviewId)); List _queryParameters = new List(); @@ -2212,9 +2212,9 @@ public Reviews(ContentModeratorClient client) /// public async Task AddVideoFrameStreamWithHttpMessagesAsync(string contentType, string teamName, string reviewId, Stream frameImageZip, string frameMetadata, int? timescale = default(int?), Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (contentType == null) { @@ -2255,7 +2255,7 @@ public Reviews(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/review/v1.0/teams/{teamName}/reviews/{reviewId}/frames"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); _url = _url.Replace("{teamName}", System.Uri.EscapeDataString(teamName)); _url = _url.Replace("{reviewId}", System.Uri.EscapeDataString(reviewId)); List _queryParameters = new List(); @@ -2294,14 +2294,22 @@ public Reviews(ContentModeratorClient client) { StreamContent _frameImageZip = new StreamContent(frameImageZip); _frameImageZip.Headers.ContentType = new MediaTypeHeaderValue("application/octet-stream"); - FileStream _frameImageZipAsFileStream = frameImageZip as FileStream; - if (_frameImageZipAsFileStream != null) + ContentDispositionHeaderValue _contentDispositionHeaderValue = new ContentDispositionHeaderValue("form-data"); + _contentDispositionHeaderValue.Name = "frameImageZip"; + // get filename from stream if it's a file otherwise, just use 'unknown' + var _fileStream = frameImageZip as FileStream; + var _fileName = (_fileStream != null ? _fileStream.Name : null) ?? "unknown"; + if(System.Linq.Enumerable.Any(_fileName, c => c > 127) ) { - ContentDispositionHeaderValue _contentDispositionHeaderValue = new ContentDispositionHeaderValue("form-data"); - _contentDispositionHeaderValue.Name = "frameImageZip"; - _contentDispositionHeaderValue.FileName = _frameImageZipAsFileStream.Name; - _frameImageZip.Headers.ContentDisposition = _contentDispositionHeaderValue; + // non ASCII chars detected, need UTF encoding: + _contentDispositionHeaderValue.FileNameStar = _fileName; } + else + { + // ASCII only + _contentDispositionHeaderValue.FileName = _fileName; + } + _frameImageZip.Headers.ContentDisposition = _contentDispositionHeaderValue; _multiPartContent.Add(_frameImageZip, "frameImageZip"); } if (frameMetadata != null) diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/TextModeration.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/TextModeration.cs index d0bffb551a12..44d927c764f8 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/TextModeration.cs +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Generated/TextModeration.cs @@ -98,9 +98,9 @@ public TextModeration(ContentModeratorClient client) /// public async Task> ScreenTextWithHttpMessagesAsync(string textContentType, Stream textContent, string language = default(string), bool? autocorrect = false, bool? pII = false, string listId = default(string), bool? classify = false, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (textContentType == null) { @@ -130,7 +130,7 @@ public TextModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessText/Screen/"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); List _queryParameters = new List(); if (language != null) { @@ -301,9 +301,9 @@ public TextModeration(ContentModeratorClient client) /// public async Task> DetectLanguageWithHttpMessagesAsync(string textContentType, Stream textContent, Dictionary> customHeaders = null, CancellationToken cancellationToken = default(CancellationToken)) { - if (Client.BaseUrl == null) + if (Client.Endpoint == null) { - throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.BaseUrl"); + throw new ValidationException(ValidationRules.CannotBeNull, "this.Client.Endpoint"); } if (textContentType == null) { @@ -328,7 +328,7 @@ public TextModeration(ContentModeratorClient client) // Construct URL var _baseUrl = Client.BaseUri; var _url = _baseUrl + (_baseUrl.EndsWith("/") ? "" : "/") + "contentmoderator/moderate/v1.0/ProcessText/DetectLanguage"; - _url = _url.Replace("{baseUrl}", Client.BaseUrl); + _url = _url.Replace("{Endpoint}", Client.Endpoint); // Create HTTP transport objects var _httpRequest = new HttpRequestMessage(); HttpResponseMessage _httpResponse = null; diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Microsoft.Azure.CognitiveServices.ContentModerator.csproj b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Microsoft.Azure.CognitiveServices.ContentModerator.csproj index 3c165e44d85f..3b1bac857d66 100644 --- a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Microsoft.Azure.CognitiveServices.ContentModerator.csproj +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Microsoft.Azure.CognitiveServices.ContentModerator.csproj @@ -1,11 +1,12 @@  - + + Microsoft.Azure.CognitiveServices.ContentModerator This client library provides access to the Microsoft Cognitive Services Content Moderator APIs. - 0.12.1-preview + 0.13.0-preview Microsoft.Azure.CognitiveServices.ContentModerator ContentModerator;Content Moderator; @@ -13,7 +14,8 @@ This is a preview release of the Cognitive Services Content Moderator SDK. Changes in this release: - 1. Additional AzureRegions: Canada Central, Japan East, Central India and UK South + 1. Supported customizing service endpoints by assigning the endpoint string to ContentModeratorClient.Endpoint. The endpoint string can be found on Azure Portal, it should contain only protocol and hostname, for example: https://westus.api.cognitive.microsoft.com. + 2. Body.Metadata, ImageList.Metadata, TermList.Metadata, members of RefreshIndex.Metadata are now IDictionary. ]]> diff --git a/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Properties/AssemblyInfo.cs b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Properties/AssemblyInfo.cs new file mode 100644 index 000000000000..0ea6c7213b73 --- /dev/null +++ b/src/SDKs/CognitiveServices/dataPlane/Vision/ContentModerator/ContentModerator/Properties/AssemblyInfo.cs @@ -0,0 +1,18 @@ +// Copyright (c) Microsoft Corporation. All rights reserved. +// Licensed under the MIT License. See License.txt in the project root for license information. + +using System.Reflection; +using System.Resources; + +[assembly: AssemblyTitle("Microsoft Cognitive Services Content Moderator SDK")] +[assembly: AssemblyDescription("Provides access to the Microsoft Cognitive Services Content Moderator APIs.")] + +[assembly: AssemblyVersion("0.9.0.0")] +[assembly: AssemblyFileVersion("0.13.0.0")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct("Microsoft Azure .NET SDK")] +[assembly: AssemblyCopyright("Copyright (c) Microsoft Corporation")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] +[assembly: NeutralResourcesLanguage("en")] diff --git a/src/SDKs/_metadata/cognitiveservices_data-plane_ContentModerator.txt b/src/SDKs/_metadata/cognitiveservices_data-plane_ContentModerator.txt index 649929d0b2b5..8b42c021a581 100644 --- a/src/SDKs/_metadata/cognitiveservices_data-plane_ContentModerator.txt +++ b/src/SDKs/_metadata/cognitiveservices_data-plane_ContentModerator.txt @@ -4,15 +4,15 @@ Commencing code generation Generating CSharp code Executing AutoRest command cmd.exe /c autorest.cmd https://github.com/Azure/azure-rest-api-specs/blob/master/specification/cognitiveservices/data-plane/ContentModerator/readme.md --csharp --version=latest --reflect-api-versions --csharp-sdks-folder=E:\azure-sdk-for-net\src\SDKs -2018-06-29 01:00:15 UTC +2018-08-21 17:38:47 UTC 1) azure-rest-api-specs repository information GitHub fork: Azure Branch: master -Commit: 8f450203257c4d587b5056954e6246e7be18c6e4 +Commit: 5edfea925fc41eeff87bfd09b91d0eb7b236616d 2) AutoRest information Requested version: latest -Bootstrapper version: autorest@2.0.4280 +Bootstrapper version: autorest@2.0.4283 Latest installed version: