Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TA] Fixed incompatible changes after using the latest swagger SHA #30278

Merged
merged 4 commits into from
Aug 5, 2022
+2,050 −3,259
Merged

[TA] Fixed incompatible changes after using the latest swagger SHA #30278

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6208fe4
resolve conflict
mssfang Aug 4, 2022
88fd20f
Merge remote-tracking branch 'upstream' into TA-regenerate-latest-sha
mssfang Aug 5, 2022
4305f3c
Merge branch 'TA-5.2.0' into TA-regenerate-latest-sha
mssfang Aug 5, 2022
4587005
update recording files
mssfang Aug 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...i-textanalytics/src/main/java/com/azure/ai/textanalytics/AnalyzeSentimentAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.ai.textanalytics;

import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceImpl;
import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceTextAnalysisImpl;
import com.azure.ai.textanalytics.implementation.TextAnalyticsClientImpl;
import com.azure.ai.textanalytics.implementation.Utility;
import com.azure.ai.textanalytics.implementation.models.AnalyzeTextSentimentAnalysisInput;
Expand Down Expand Up @@ -36,14 +36,14 @@
class AnalyzeSentimentAsyncClient {
private final ClientLogger logger = new ClientLogger(AnalyzeSentimentAsyncClient.class);
private final TextAnalyticsClientImpl legacyService;
private final MicrosoftCognitiveLanguageServiceImpl service;
private final MicrosoftCognitiveLanguageServiceTextAnalysisImpl service;

AnalyzeSentimentAsyncClient(TextAnalyticsClientImpl legacyService) {
this.legacyService = legacyService;
this.service = null;
}

AnalyzeSentimentAsyncClient(MicrosoftCognitiveLanguageServiceImpl service) {
AnalyzeSentimentAsyncClient(MicrosoftCognitiveLanguageServiceTextAnalysisImpl service) {
this.legacyService = null;
this.service = service;
}
Expand Down
6 changes: 3 additions & 3 deletions ...-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/DetectLanguageAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.ai.textanalytics;

import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceImpl;
import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceTextAnalysisImpl;
import com.azure.ai.textanalytics.implementation.TextAnalyticsClientImpl;
import com.azure.ai.textanalytics.implementation.Utility;
import com.azure.ai.textanalytics.implementation.models.AnalyzeTextLanguageDetectionInput;
Expand Down Expand Up @@ -36,14 +36,14 @@
class DetectLanguageAsyncClient {
private final ClientLogger logger = new ClientLogger(DetectLanguageAsyncClient.class);
private final TextAnalyticsClientImpl legacyService;
private final MicrosoftCognitiveLanguageServiceImpl service;
private final MicrosoftCognitiveLanguageServiceTextAnalysisImpl service;

DetectLanguageAsyncClient(TextAnalyticsClientImpl legacyService) {
this.legacyService = legacyService;
this.service = null;
}

DetectLanguageAsyncClient(MicrosoftCognitiveLanguageServiceImpl service) {
DetectLanguageAsyncClient(MicrosoftCognitiveLanguageServiceTextAnalysisImpl service) {
this.legacyService = null;
this.service = service;
}
Expand Down
6 changes: 3 additions & 3 deletions ...i-textanalytics/src/main/java/com/azure/ai/textanalytics/ExtractKeyPhraseAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.ai.textanalytics;

import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceImpl;
import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceTextAnalysisImpl;
import com.azure.ai.textanalytics.implementation.TextAnalyticsClientImpl;
import com.azure.ai.textanalytics.implementation.Utility;
import com.azure.ai.textanalytics.implementation.models.AnalyzeTextKeyPhraseExtractionInput;
Expand Down Expand Up @@ -41,14 +41,14 @@
class ExtractKeyPhraseAsyncClient {
private final ClientLogger logger = new ClientLogger(ExtractKeyPhraseAsyncClient.class);
private final TextAnalyticsClientImpl legacyService;
private final MicrosoftCognitiveLanguageServiceImpl service;
private final MicrosoftCognitiveLanguageServiceTextAnalysisImpl service;

ExtractKeyPhraseAsyncClient(TextAnalyticsClientImpl legacyService) {
this.legacyService = legacyService;
this.service = null;
}

ExtractKeyPhraseAsyncClient(MicrosoftCognitiveLanguageServiceImpl service) {
ExtractKeyPhraseAsyncClient(MicrosoftCognitiveLanguageServiceTextAnalysisImpl service) {
this.legacyService = null;
this.service = service;
}
Expand Down
6 changes: 3 additions & 3 deletions ...ai-textanalytics/src/main/java/com/azure/ai/textanalytics/RecognizeEntityAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.ai.textanalytics;

import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceImpl;
import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceTextAnalysisImpl;
import com.azure.ai.textanalytics.implementation.TextAnalyticsClientImpl;
import com.azure.ai.textanalytics.implementation.Utility;
import com.azure.ai.textanalytics.implementation.models.AnalyzeTextEntityRecognitionInput;
Expand Down Expand Up @@ -42,14 +42,14 @@
class RecognizeEntityAsyncClient {
private final ClientLogger logger = new ClientLogger(RecognizeEntityAsyncClient.class);
private final TextAnalyticsClientImpl legacyService;
private final MicrosoftCognitiveLanguageServiceImpl service;
private final MicrosoftCognitiveLanguageServiceTextAnalysisImpl service;

RecognizeEntityAsyncClient(TextAnalyticsClientImpl legacyService) {
this.legacyService = legacyService;
this.service = null;
}

RecognizeEntityAsyncClient(MicrosoftCognitiveLanguageServiceImpl service) {
RecognizeEntityAsyncClient(MicrosoftCognitiveLanguageServiceTextAnalysisImpl service) {
this.legacyService = null;
this.service = service;
}
Expand Down
6 changes: 3 additions & 3 deletions ...tanalytics/src/main/java/com/azure/ai/textanalytics/RecognizeLinkedEntityAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.ai.textanalytics;

import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceImpl;
import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceTextAnalysisImpl;
import com.azure.ai.textanalytics.implementation.TextAnalyticsClientImpl;
import com.azure.ai.textanalytics.implementation.Utility;
import com.azure.ai.textanalytics.implementation.models.AnalyzeTextEntityLinkingInput;
Expand Down Expand Up @@ -42,14 +42,14 @@
class RecognizeLinkedEntityAsyncClient {
private final ClientLogger logger = new ClientLogger(RecognizeLinkedEntityAsyncClient.class);
private final TextAnalyticsClientImpl legacyService;
private final MicrosoftCognitiveLanguageServiceImpl service;
private final MicrosoftCognitiveLanguageServiceTextAnalysisImpl service;

RecognizeLinkedEntityAsyncClient(TextAnalyticsClientImpl legacyService) {
this.legacyService = legacyService;
this.service = null;
}

RecognizeLinkedEntityAsyncClient(MicrosoftCognitiveLanguageServiceImpl service) {
RecognizeLinkedEntityAsyncClient(MicrosoftCognitiveLanguageServiceTextAnalysisImpl service) {
this.legacyService = null;
this.service = service;
}
Expand Down
6 changes: 3 additions & 3 deletions ...textanalytics/src/main/java/com/azure/ai/textanalytics/RecognizePiiEntityAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

package com.azure.ai.textanalytics;

import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceImpl;
import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceTextAnalysisImpl;
import com.azure.ai.textanalytics.implementation.TextAnalyticsClientImpl;
import com.azure.ai.textanalytics.implementation.Utility;
import com.azure.ai.textanalytics.implementation.models.AnalyzeTextPiiEntitiesRecognitionInput;
Expand Down Expand Up @@ -43,14 +43,14 @@
class RecognizePiiEntityAsyncClient {
private final ClientLogger logger = new ClientLogger(RecognizePiiEntityAsyncClient.class);
private final TextAnalyticsClientImpl legacyService;
private final MicrosoftCognitiveLanguageServiceImpl service;
private final MicrosoftCognitiveLanguageServiceTextAnalysisImpl service;

RecognizePiiEntityAsyncClient(TextAnalyticsClientImpl legacyService) {
this.legacyService = legacyService;
this.service = null;
}

RecognizePiiEntityAsyncClient(MicrosoftCognitiveLanguageServiceImpl service) {
RecognizePiiEntityAsyncClient(MicrosoftCognitiveLanguageServiceTextAnalysisImpl service) {
this.legacyService = null;
this.service = service;
}
Expand Down
8 changes: 4 additions & 4 deletions ...e-ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsAsyncClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
package com.azure.ai.textanalytics;

import com.azure.ai.textanalytics.implementation.AnalyzeTextsImpl;
import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceImpl;
import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceTextAnalysisImpl;
import com.azure.ai.textanalytics.implementation.TextAnalyticsClientImpl;
import com.azure.ai.textanalytics.models.AnalyzeActionsOperationDetail;
import com.azure.ai.textanalytics.models.AnalyzeActionsOptions;
Expand Down Expand Up @@ -77,7 +77,7 @@
public final class TextAnalyticsAsyncClient {
private final ClientLogger logger = new ClientLogger(TextAnalyticsAsyncClient.class);
private final TextAnalyticsClientImpl legacyService;
private final MicrosoftCognitiveLanguageServiceImpl service;
private final MicrosoftCognitiveLanguageServiceTextAnalysisImpl service;
private final TextAnalyticsServiceVersion serviceVersion;
private final String defaultCountryHint;
private final String defaultLanguage;
Expand Down Expand Up @@ -120,8 +120,8 @@ public final class TextAnalyticsAsyncClient {
this.analyzeActionsAsyncClient = new AnalyzeActionsAsyncClient(legacyService);
}

TextAnalyticsAsyncClient(MicrosoftCognitiveLanguageServiceImpl service, TextAnalyticsServiceVersion serviceVersion,
String defaultCountryHint, String defaultLanguage) {
TextAnalyticsAsyncClient(MicrosoftCognitiveLanguageServiceTextAnalysisImpl service,
TextAnalyticsServiceVersion serviceVersion, String defaultCountryHint, String defaultLanguage) {
this.legacyService = null;
this.service = service;
this.serviceVersion = serviceVersion;
Expand Down
8 changes: 4 additions & 4 deletions ...ai-textanalytics/src/main/java/com/azure/ai/textanalytics/TextAnalyticsClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
package com.azure.ai.textanalytics;

import com.azure.ai.textanalytics.implementation.Constants;
import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceImpl;
import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceImplBuilder;
import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceTextAnalysisImpl;
import com.azure.ai.textanalytics.implementation.MicrosoftCognitiveLanguageServiceTextAnalysisImplBuilder;
import com.azure.ai.textanalytics.implementation.TextAnalyticsClientImpl;
import com.azure.ai.textanalytics.implementation.TextAnalyticsClientImplBuilder;
import com.azure.core.annotation.ServiceClientBuilder;
Expand Down Expand Up @@ -262,8 +262,8 @@ public TextAnalyticsAsyncClient buildAsyncClient() {

return new TextAnalyticsAsyncClient(textAnalyticsAPI, serviceVersion, defaultCountryHint, defaultLanguage);
} else {
final MicrosoftCognitiveLanguageServiceImpl batchApiTextAnalyticsClient =
new MicrosoftCognitiveLanguageServiceImplBuilder()
final MicrosoftCognitiveLanguageServiceTextAnalysisImpl batchApiTextAnalyticsClient =
new MicrosoftCognitiveLanguageServiceTextAnalysisImplBuilder()
.endpoint(endpoint)
.apiVersion(serviceVersion.getVersion())
.pipeline(pipeline)
Expand Down
5 changes: 3 additions & 2 deletions ...xtanalytics/src/main/java/com/azure/ai/textanalytics/implementation/AnalyzeTextsImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,10 @@
import com.azure.core.http.rest.ResponseBase;
import com.azure.core.http.rest.RestProxy;
import com.azure.core.util.Context;
import java.util.UUID;
import reactor.core.publisher.Mono;

import java.util.UUID;

/** An instance of this class provides access to all the operations defined in AnalyzeTexts. */
public final class AnalyzeTextsImpl {
/** The proxy service used to perform REST calls. */
Expand All @@ -42,7 +43,7 @@ public final class AnalyzeTextsImpl {
*
* @param client the instance of the service client containing this operation class.
*/
AnalyzeTextsImpl(MicrosoftCognitiveLanguageServiceTextAnalysisImpl client) {
mssfang marked this conversation as resolved.
Show resolved Hide resolved
public AnalyzeTextsImpl(MicrosoftCognitiveLanguageServiceTextAnalysisImpl client) {
this.service =
RestProxy.create(AnalyzeTextsService.class, client.getHttpPipeline(), client.getSerializerAdapter());
this.client = client;
Expand Down
Loading