From 7f13f5bb99ad87dac8565e9fcfd9ebafddbab37d Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Mon, 25 Nov 2019 14:08:07 -0800 Subject: [PATCH 1/2] api review changes --- pom.client.xml | 1 + .../azure-cs-textanalytics/pom.xml | 12 +----- .../TextAnalyticsAsyncClient.java | 22 +++++----- .../cs/textanalytics/TextAnalyticsClient.java | 18 +++----- .../TextAnalyticsServiceVersion.java | 4 +- .../implementation/TextAnalyticsAPIImpl.java | 42 ++++++++++++++++--- .../models/LanguageBatchInput.java | 8 ++-- ...ugeInput.java => DetectLanguageInput.java} | 10 ++--- .../models/DetectedLanguageResult.java | 10 ++--- .../textanalytics/models/KeyPhraseResult.java | 10 ++--- .../models/LinkedEntityResult.java | 10 ++--- .../models/NamedEntityResult.java | 10 ++--- .../models/TextAnalyticsRequestOptions.java | 10 ++--- .../models/TextSentimentResult.java | 22 +++++----- 14 files changed, 103 insertions(+), 86 deletions(-) rename sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/{DetectLangaugeInput.java => DetectLanguageInput.java} (88%) diff --git a/pom.client.xml b/pom.client.xml index 5eb2ba7cf69c..ee5a1d240472 100644 --- a/pom.client.xml +++ b/pom.client.xml @@ -989,5 +989,6 @@ sdk/storage/azure-storage-file-datalake sdk/storage/azure-storage-queue sdk/storage/azure-storage-queue-cryptography + sdk/cognitiveservices/azure-cs-textanalytics diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/pom.xml b/sdk/cognitiveservices/azure-cs-textanalytics/pom.xml index 21f0e8c7e293..c844470a8519 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/pom.xml +++ b/sdk/cognitiveservices/azure-cs-textanalytics/pom.xml @@ -7,13 +7,13 @@ com.azure azure-client-sdk-parent - 1.4.0 + 1.6.0 ../../../pom.client.xml com.azure azure-cognitiveservices-textanalytics - 1.1.0-beta.1 + 1.0.0-beta.1 Microsoft Azure client library for Cognitive Services Text Analytics This package contains the Microsoft Azure Cognitive Services Text Analytics SDK. @@ -38,19 +38,11 @@ azure-core 1.1.0-beta.1 - - org.slf4j - slf4j-api - com.azure azure-core-http-netty 1.1.0-beta.1 - - com.fasterxml.jackson.core - jackson-annotations - diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/TextAnalyticsAsyncClient.java b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/TextAnalyticsAsyncClient.java index 239dd388f35b..540a9cc67f97 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/TextAnalyticsAsyncClient.java +++ b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/TextAnalyticsAsyncClient.java @@ -17,7 +17,7 @@ import com.azure.cs.textanalytics.models.DocumentResultCollection; import com.azure.cs.textanalytics.models.KeyPhraseResult; import com.azure.cs.textanalytics.models.LinkedEntityResult; -import com.azure.cs.textanalytics.models.DetectLangaugeInput; +import com.azure.cs.textanalytics.models.DetectLanguageInput; import com.azure.cs.textanalytics.models.NamedEntityResult; import com.azure.cs.textanalytics.models.TextDocumentInput; import com.azure.cs.textanalytics.models.TextAnalyticsRequestOptions; @@ -83,13 +83,13 @@ public Mono> detectLanguages(Li // Advantage user @ServiceMethod(returns = ReturnType.SINGLE) - public Mono> detectLanguages(List inputs) { + public Mono> detectLanguages(List inputs) { return null; } @ServiceMethod(returns = ReturnType.SINGLE) public Mono> detectLanguages( - List inputs, TextAnalyticsRequestOptions options) { + List inputs, TextAnalyticsRequestOptions options) { // try { // return withContext( // context -> detectLanguagesWithResponse(inputs, options, context)); @@ -101,14 +101,14 @@ public Mono> detectLanguages( @ServiceMethod(returns = ReturnType.SINGLE) public Mono>> detectLanguagesWithResponse( - List inputs, TextAnalyticsRequestOptions options) { + List inputs, TextAnalyticsRequestOptions options) { return null; } Mono>> detectLanguagesWithResponse( - List inputs, TextAnalyticsRequestOptions options, Context context) { + List inputs, TextAnalyticsRequestOptions options, Context context) { return client.languagesWithRestResponseAsync(new LanguageBatchInput().setDocuments(inputs), - options.getModelVersion(), options.isShowStatistics(), context) + options.getModelVersion(), options.showStatistics(), context) .map(response -> new SimpleResponse<>(response, null)); } @@ -168,7 +168,7 @@ Mono>> recognizeEntitiesWit List document, TextAnalyticsRequestOptions options, Context context) { return client.entitiesRecognitionGeneralWithRestResponseAsync( new MultiLanguageBatchInput().setDocuments(document), options.getModelVersion(), - options.isShowStatistics(), context).map(response -> new SimpleResponse<>(response, null)); + options.showStatistics(), context).map(response -> new SimpleResponse<>(response, null)); } // (3) PII entities @@ -228,7 +228,7 @@ Mono>> recognizePiiEntities List document, TextAnalyticsRequestOptions options, Context context) { // TODO: validate multiLanguageBatchInput return client.entitiesRecognitionPiiWithRestResponseAsync(new MultiLanguageBatchInput().setDocuments(document), - options.getModelVersion(), options.isShowStatistics(), context) + options.getModelVersion(), options.showStatistics(), context) .map(response -> new SimpleResponse<>(response, null)); } @@ -289,7 +289,7 @@ Mono>> recognizeLinkedEnti List inputs, TextAnalyticsRequestOptions options, Context context) { // TODO: validate multiLanguageBatchInput return client.entitiesLinkingWithRestResponseAsync(new MultiLanguageBatchInput().setDocuments(inputs), - options.getModelVersion(), options.isShowStatistics(), context) + options.getModelVersion(), options.showStatistics(), context) .map(response -> new SimpleResponse<>(response, null)); } @@ -363,7 +363,7 @@ public Mono>> extractKeyPhras Mono>> extractKeyPhrasesWithResponse( List document, TextAnalyticsRequestOptions options, Context context) { return client.keyPhrasesWithRestResponseAsync(new MultiLanguageBatchInput().setDocuments(document), - options.getModelVersion(), options.isShowStatistics(), context).map(response -> + options.getModelVersion(), options.showStatistics(), context).map(response -> new SimpleResponse<>(response, null)); } @@ -440,7 +440,7 @@ Mono>> analyzeDocumentSen List document, TextAnalyticsRequestOptions options, Context context) { // TODO: validate multiLanguageBatchInput return client.sentimentWithRestResponseAsync( - new MultiLanguageBatchInput().setDocuments(document), options.getModelVersion(), options.isShowStatistics(), + new MultiLanguageBatchInput().setDocuments(document), options.getModelVersion(), options.showStatistics(), context).map(response -> new SimpleResponse<>(response, null)); } } diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/TextAnalyticsClient.java b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/TextAnalyticsClient.java index 15ca10d4a18d..346d33569ba0 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/TextAnalyticsClient.java +++ b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/TextAnalyticsClient.java @@ -6,23 +6,17 @@ import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceClient; import com.azure.core.annotation.ServiceMethod; -import com.azure.core.http.rest.PagedIterable; import com.azure.core.http.rest.Response; import com.azure.core.util.Context; -import com.azure.cs.textanalytics.models.DetectedLanguage; +import com.azure.cs.textanalytics.models.DetectLanguageInput; import com.azure.cs.textanalytics.models.DetectedLanguageResult; import com.azure.cs.textanalytics.models.DocumentResultCollection; import com.azure.cs.textanalytics.models.KeyPhraseResult; import com.azure.cs.textanalytics.models.LinkedEntityResult; -import com.azure.cs.textanalytics.models.NamedEntity; import com.azure.cs.textanalytics.models.NamedEntityResult; -import com.azure.cs.textanalytics.models.TextSentiment; -import com.azure.cs.textanalytics.models.DetectLangaugeInput; -import com.azure.cs.textanalytics.models.LinkedEntity; -import com.azure.cs.textanalytics.models.TextDocumentInput; import com.azure.cs.textanalytics.models.TextAnalyticsRequestOptions; +import com.azure.cs.textanalytics.models.TextDocumentInput; import com.azure.cs.textanalytics.models.TextSentimentResult; -import reactor.core.publisher.Mono; import java.util.List; @@ -37,7 +31,7 @@ public final class TextAnalyticsClient { // (1) language // new user @ServiceMethod(returns = ReturnType.SINGLE) - public DetectedLanguageResult detectLanguage(String text) { return null;} + public DetectedLanguageResult detectLanguage(String text) { return null; } @ServiceMethod(returns = ReturnType.SINGLE) public DetectedLanguageResult detectLanguage(String text, String countryHint) { @@ -58,19 +52,19 @@ public DocumentResultCollection detectLanguages(List detectLanguages(List inputs) { + public DocumentResultCollection detectLanguages(List inputs) { return null; } @ServiceMethod(returns = ReturnType.SINGLE) public DocumentResultCollection detectLanguages( - List inputs, TextAnalyticsRequestOptions options) { + List inputs, TextAnalyticsRequestOptions options) { return null; } @ServiceMethod(returns = ReturnType.SINGLE) public Response> detectLanguagesWithResponse( - List inputs, TextAnalyticsRequestOptions options, Context context) { + List inputs, TextAnalyticsRequestOptions options, Context context) { return client.detectLanguagesWithResponse(inputs, options, context).block(); } diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/TextAnalyticsServiceVersion.java b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/TextAnalyticsServiceVersion.java index 861db3fc7918..4eeecd3774f8 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/TextAnalyticsServiceVersion.java +++ b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/TextAnalyticsServiceVersion.java @@ -9,7 +9,7 @@ * The versions of Azure Text Analytics supported by this client library. */ public enum TextAnalyticsServiceVersion implements ServiceVersion { - V1_0("1.0"); + V3_0_preview_1 ("v3.0-preview.1"); private final String version; @@ -31,7 +31,7 @@ public String getVersion() { * @return the latest {@link TextAnalyticsServiceVersion} */ public static TextAnalyticsServiceVersion getLatest() { - return V1_0; + return V3_0_preview_1; } } diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/implementation/TextAnalyticsAPIImpl.java b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/implementation/TextAnalyticsAPIImpl.java index 801835c4fa6f..7f3ac3f603ae 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/implementation/TextAnalyticsAPIImpl.java +++ b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/implementation/TextAnalyticsAPIImpl.java @@ -13,6 +13,8 @@ import com.azure.core.annotation.ReturnType; import com.azure.core.annotation.ServiceInterface; import com.azure.core.annotation.ServiceMethod; +import com.azure.core.annotation.UnexpectedResponseExceptionType; +import com.azure.core.exception.HttpResponseException; import com.azure.core.http.HttpPipeline; import com.azure.core.http.rest.RestProxy; import com.azure.core.http.rest.SimpleResponse; @@ -95,27 +97,55 @@ public TextAnalyticsAPIImpl(HttpPipeline httpPipeline) { private interface TextAnalyticsAPIService { @Post("entities/recognition/general") @ExpectedResponses({200, 500}) - Mono> entitiesRecognitionGeneral(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput multiLanguageBatchInput, Context context); + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> entitiesRecognitionGeneral(@HostParam("Endpoint") String endpoint, + @QueryParam("model-version") String modelVersion, + @QueryParam("showStats") Boolean showStats, + @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput multiLanguageBatchInput, + Context context); @Post("entities/recognition/pii") @ExpectedResponses({200, 500}) - Mono> entitiesRecognitionPii(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput multiLanguageBatchInput, Context context); + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> entitiesRecognitionPii(@HostParam("Endpoint") String endpoint, + @QueryParam("model-version") String modelVersion, + @QueryParam("showStats") Boolean showStats, + @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput multiLanguageBatchInput, + Context context); @Post("entities/linking") @ExpectedResponses({200, 500}) - Mono> entitiesLinking(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput multiLanguageBatchInput, Context context); + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> entitiesLinking(@HostParam("Endpoint") String endpoint, + @QueryParam("model-version") String modelVersion, + @QueryParam("showStats") Boolean showStats, + @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput multiLanguageBatchInput, + Context context); @Post("keyPhrases") @ExpectedResponses({200, 500}) - Mono> keyPhrases(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput multiLanguageBatchInput, Context context); + @UnexpectedResponseExceptionType(HttpResponseException.class) + Mono> keyPhrases(@HostParam("Endpoint") String endpoint, + @QueryParam("model-version") String modelVersion, + @QueryParam("showStats") Boolean showStats, + @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput multiLanguageBatchInput, + Context context); @Post("languages") @ExpectedResponses({200, 500}) - Mono> languages(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json; charset=utf-8") LanguageBatchInput languageBatchInput, Context context); + Mono> languages(@HostParam("Endpoint") String endpoint, + @QueryParam("model-version") String modelVersion, + @QueryParam("showStats") Boolean showStats, + @BodyParam("application/json; charset=utf-8") LanguageBatchInput languageBatchInput, + Context context); @Post("sentiment") @ExpectedResponses({200, 500}) - Mono> sentiment(@HostParam("Endpoint") String endpoint, @QueryParam("model-version") String modelVersion, @QueryParam("showStats") Boolean showStats, @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput multiLanguageBatchInput, Context context); + Mono> sentiment(@HostParam("Endpoint") String endpoint, + @QueryParam("model-version") String modelVersion, + @QueryParam("showStats") Boolean showStats, + @BodyParam("application/json; charset=utf-8") MultiLanguageBatchInput multiLanguageBatchInput, + Context context); } /** diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/implementation/models/LanguageBatchInput.java b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/implementation/models/LanguageBatchInput.java index 4aa545d988d5..2505d0a02543 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/implementation/models/LanguageBatchInput.java +++ b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/implementation/models/LanguageBatchInput.java @@ -5,7 +5,7 @@ package com.azure.cs.textanalytics.implementation.models; import com.azure.core.annotation.Fluent; -import com.azure.cs.textanalytics.models.DetectLangaugeInput; +import com.azure.cs.textanalytics.models.DetectLanguageInput; import com.fasterxml.jackson.annotation.JsonProperty; import java.util.List; @@ -18,14 +18,14 @@ public final class LanguageBatchInput { * The documents property. */ @JsonProperty(value = "documents", required = true) - private List documents; + private List documents; /** * Get the documents property: The documents property. * * @return the documents value. */ - public List getDocuments() { + public List getDocuments() { return this.documents; } @@ -35,7 +35,7 @@ public List getDocuments() { * @param documents the documents value to set. * @return the LanguageBatchInput object itself. */ - public LanguageBatchInput setDocuments(List documents) { + public LanguageBatchInput setDocuments(List documents) { this.documents = documents; return this; } diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/DetectLangaugeInput.java b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/DetectLanguageInput.java similarity index 88% rename from sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/DetectLangaugeInput.java rename to sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/DetectLanguageInput.java index 69647ec8137e..7f03dbfdef2b 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/DetectLangaugeInput.java +++ b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/DetectLanguageInput.java @@ -11,9 +11,9 @@ * The UnknownLanguageInput model. */ @Fluent -public final class DetectLangaugeInput { +public final class DetectLanguageInput { - public DetectLangaugeInput(String id, String text) { + public DetectLanguageInput(String id, String text) { this.id = id; this.text = text; } @@ -51,7 +51,7 @@ public String getId() { * @param id the id value to set. * @return the UnknownLanguageInput object itself. */ - DetectLangaugeInput setId(String id) { + DetectLanguageInput setId(String id) { this.id = id; return this; } @@ -71,7 +71,7 @@ public String getText() { * @param text the text value to set. * @return the UnknownLanguageInput object itself. */ - public DetectLangaugeInput setText(String text) { + public DetectLanguageInput setText(String text) { this.text = text; return this; } @@ -91,7 +91,7 @@ public String getCountryHint() { * @param countryHint the countryHint value to set. * @return the UnknownLanguageInput object itself. */ - public DetectLangaugeInput setCountryHint(String countryHint) { + public DetectLanguageInput setCountryHint(String countryHint) { this.countryHint = countryHint; return this; } diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/DetectedLanguageResult.java b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/DetectedLanguageResult.java index fda2a39088d3..cab390ed561e 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/DetectedLanguageResult.java +++ b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/DetectedLanguageResult.java @@ -12,7 +12,7 @@ @Fluent public final class DetectedLanguageResult extends DocumentResult { private DetectedLanguage primaryLanguage; - private IterableStream items; + private IterableStream detectedLanguages; public DetectedLanguage getPrimaryLanguage() { return primaryLanguage; @@ -23,12 +23,12 @@ DetectedLanguageResult setPrimaryLanguage(DetectedLanguage detectedLanguage) { return this; } - public IterableStream getItems() { - return items; + public IterableStream getDetectedLanguages() { + return detectedLanguages; } - DetectedLanguageResult setItems(IterableStream items) { - this.items = items; + DetectedLanguageResult setDetectedLanguages(IterableStream detectedLanguages) { + this.detectedLanguages = detectedLanguages; return this; } } diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/KeyPhraseResult.java b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/KeyPhraseResult.java index 334712722c74..7b300ae94b21 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/KeyPhraseResult.java +++ b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/KeyPhraseResult.java @@ -11,14 +11,14 @@ */ @Fluent public final class KeyPhraseResult extends DocumentResult { - private IterableStream items; + private IterableStream keyPhrases; - public IterableStream getItems() { - return items; + public IterableStream getKeyPhrases() { + return keyPhrases; } - KeyPhraseResult setItems(IterableStream items) { - this.items = items; + KeyPhraseResult setKeyPhrases(IterableStream keyPhrases) { + this.keyPhrases = keyPhrases; return this; } } diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/LinkedEntityResult.java b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/LinkedEntityResult.java index 9a8636da5ad9..41a910ea0ea6 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/LinkedEntityResult.java +++ b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/LinkedEntityResult.java @@ -11,14 +11,14 @@ */ @Fluent public final class LinkedEntityResult extends DocumentResult { - private IterableStream items; + private IterableStream linkedEntities; - public IterableStream getItems() { - return items; + public IterableStream getLinkedEntities() { + return linkedEntities; } - LinkedEntityResult setItems(IterableStream items) { - this.items = items; + LinkedEntityResult setLinkedEntities(IterableStream linkedEntities) { + this.linkedEntities = linkedEntities; return this; } } diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/NamedEntityResult.java b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/NamedEntityResult.java index eff7bb98bcfb..d83b2b6f94ba 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/NamedEntityResult.java +++ b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/NamedEntityResult.java @@ -11,14 +11,14 @@ */ @Fluent public final class NamedEntityResult extends DocumentResult { - private IterableStream items; + private IterableStream namedEntities; - public IterableStream getItems() { - return items; + public IterableStream getNamedEntities() { + return namedEntities; } - NamedEntityResult setItems(IterableStream items) { - this.items = items; + NamedEntityResult setNamedEntities(IterableStream namedEntities) { + this.namedEntities = namedEntities; return this; } } diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/TextAnalyticsRequestOptions.java b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/TextAnalyticsRequestOptions.java index 5349c19a2eb7..4d0db097cb95 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/TextAnalyticsRequestOptions.java +++ b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/TextAnalyticsRequestOptions.java @@ -11,7 +11,7 @@ @Fluent public final class TextAnalyticsRequestOptions { private String modelVersion; - private boolean showStats; + private boolean showStatistics; public String getModelVersion() { return modelVersion; @@ -22,12 +22,12 @@ public TextAnalyticsRequestOptions setModelVersion(String modelVersion) { return this; } - public boolean isShowStatistics() { - return showStats; + public boolean showStatistics() { + return showStatistics; } - public TextAnalyticsRequestOptions setShowStatistics(boolean showStats) { - this.showStats = showStats; + public TextAnalyticsRequestOptions setShowStatistics(boolean showStatistics) { + this.showStatistics = showStatistics; return this; } } diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/TextSentimentResult.java b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/TextSentimentResult.java index 5eac3d119b84..e582cb1b8764 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/TextSentimentResult.java +++ b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/TextSentimentResult.java @@ -13,24 +13,24 @@ */ @Fluent public final class TextSentimentResult extends DocumentResult { - private TextSentiment textSentiment; - private IterableStream items; + private TextSentiment documentSentiment; + private IterableStream textSentiments; - public TextSentiment getTextSentiment() { - return textSentiment; + public TextSentiment getDocumentSentiment() { + return documentSentiment; } - TextSentimentResult setTextSentiment(TextSentiment textSentiment) { - this.textSentiment = textSentiment; - return this; + public IterableStream getTextSentiments() { + return textSentiments; } - public IterableStream getItems() { - return items; + TextSentimentResult setDocumentSentiment(TextSentiment documentSentiment) { + this.documentSentiment = documentSentiment; + return this; } - TextSentimentResult setItems(IterableStream items) { - this.items = items; + TextSentimentResult setTextSentiments(IterableStream textSentiments) { + this.textSentiments = textSentiments; return this; } } From f6d4501d53f407cef6ac82d1be1a3a698948c16b Mon Sep 17 00:00:00 2001 From: Sameeksha Vaity Date: Mon, 25 Nov 2019 14:52:20 -0800 Subject: [PATCH 2/2] update to sentence sentiments --- .../cs/textanalytics/models/TextSentimentResult.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/TextSentimentResult.java b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/TextSentimentResult.java index e582cb1b8764..178c6f136a94 100644 --- a/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/TextSentimentResult.java +++ b/sdk/cognitiveservices/azure-cs-textanalytics/src/main/java/com/azure/cs/textanalytics/models/TextSentimentResult.java @@ -14,14 +14,14 @@ @Fluent public final class TextSentimentResult extends DocumentResult { private TextSentiment documentSentiment; - private IterableStream textSentiments; + private IterableStream sentenceSentiments; public TextSentiment getDocumentSentiment() { return documentSentiment; } - public IterableStream getTextSentiments() { - return textSentiments; + public IterableStream getSentenceSentiments() { + return sentenceSentiments; } TextSentimentResult setDocumentSentiment(TextSentiment documentSentiment) { @@ -29,8 +29,8 @@ TextSentimentResult setDocumentSentiment(TextSentiment documentSentiment) { return this; } - TextSentimentResult setTextSentiments(IterableStream textSentiments) { - this.textSentiments = textSentiments; + TextSentimentResult setSentenceSentiments(IterableStream sentenceSentiments) { + this.sentenceSentiments = sentenceSentiments; return this; } }