Skip to content

Commit

Permalink
rearange
Browse files Browse the repository at this point in the history
  • Loading branch information
mssfang committed Dec 13, 2019
1 parent e788038 commit 5f5c198
Showing 1 changed file with 20 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,20 @@
package com.azure.ai.textanalytics;

import com.azure.ai.textanalytics.implementation.TextAnalyticsClientImpl;
import com.azure.ai.textanalytics.implementation.models.*;
import com.azure.ai.textanalytics.implementation.models.DocumentEntities;
import com.azure.ai.textanalytics.implementation.models.DocumentError;
import com.azure.ai.textanalytics.implementation.models.DocumentKeyPhrases;
import com.azure.ai.textanalytics.implementation.models.DocumentLanguage;
import com.azure.ai.textanalytics.implementation.models.DocumentLinkedEntities;
import com.azure.ai.textanalytics.implementation.models.DocumentSentiment;
import com.azure.ai.textanalytics.implementation.models.EntitiesResult;
import com.azure.ai.textanalytics.implementation.models.EntityLinkingResult;
import com.azure.ai.textanalytics.implementation.models.LanguageBatchInput;
import com.azure.ai.textanalytics.implementation.models.LanguageResult;
import com.azure.ai.textanalytics.implementation.models.MultiLanguageBatchInput;
import com.azure.ai.textanalytics.implementation.models.SentenceSentiment;
import com.azure.ai.textanalytics.implementation.models.SentimentConfidenceScorePerLabel;
import com.azure.ai.textanalytics.implementation.models.SentimentResponse;
import com.azure.ai.textanalytics.models.DetectLanguageInput;
import com.azure.ai.textanalytics.models.DetectLanguageResult;
import com.azure.ai.textanalytics.models.DocumentResultCollection;
Expand Down Expand Up @@ -471,8 +484,7 @@ public Mono<NamedEntityResult> recognizePiiEntities(String text) {
@ServiceMethod(returns = ReturnType.SINGLE)
public Mono<Response<NamedEntityResult>> recognizePiiEntitiesWithResponse(String text, String language) {
try {
return withContext(context ->
recognizePiiEntitiesWithResponse(text, language, context));
return withContext(context -> recognizePiiEntitiesWithResponse(text, language, context));
} catch (RuntimeException ex) {
return monoError(logger, ex);
}
Expand Down Expand Up @@ -517,8 +529,7 @@ public Mono<DocumentResultCollection<NamedEntityResult>> recognizePiiEntities(Li
public Mono<Response<DocumentResultCollection<NamedEntityResult>>> recognizePiiEntitiesWithResponse(
List<String> inputs, String language) {
try {
return withContext(context ->
recognizePiiEntitiesWithResponse(inputs, language, context));
return withContext(context -> recognizePiiEntitiesWithResponse(inputs, language, context));
} catch (RuntimeException ex) {
return monoError(logger, ex);
}
Expand Down Expand Up @@ -696,7 +707,6 @@ public Mono<Response<DocumentResultCollection<LinkedEntityResult>>> recognizeBat
Mono<Response<DocumentResultCollection<LinkedEntityResult>>> recognizeBatchLinkedEntitiesWithResponse(
List<TextDocumentInput> inputs, TextAnalyticsRequestOptions options, Context context) {
final MultiLanguageBatchInput batchInput = new MultiLanguageBatchInput().setDocuments(inputs);

return service.entitiesLinkingWithRestResponseAsync(
batchInput,
options == null ? null : options.getModelVersion(),
Expand Down Expand Up @@ -811,9 +821,8 @@ public Mono<Response<DocumentResultCollection<KeyPhraseResult>>> extractKeyPhras
}
}

Mono<Response<DocumentResultCollection<KeyPhraseResult>>> extractKeyPhrasesWithResponse(List<String> inputs,
String language,
Context context) {
Mono<Response<DocumentResultCollection<KeyPhraseResult>>> extractKeyPhrasesWithResponse(
List<String> inputs, String language, Context context) {
List<TextDocumentInput> documentInputs = getDocumentInputList(inputs, language);
return extractBatchKeyPhrasesWithResponse(documentInputs, null, context);
}
Expand Down Expand Up @@ -968,10 +977,8 @@ public Mono<Response<DocumentResultCollection<TextSentimentResult>>> analyzeSent
}
}

Mono<Response<DocumentResultCollection<TextSentimentResult>>> analyzeSentimentWithResponse(List<String> inputs,
String language,
Context context) {

Mono<Response<DocumentResultCollection<TextSentimentResult>>> analyzeSentimentWithResponse(
List<String> inputs, String language, Context context) {
List<TextDocumentInput> documentInputs = getDocumentInputList(inputs, language);
return analyzeBatchSentimentWithResponse(documentInputs, null, context);
}
Expand Down Expand Up @@ -1056,13 +1063,9 @@ private TextSentimentResult convertToTextSentimentResult(final DocumentSentiment
}

private List<TextSentiment> convertToSentenceSentiments(final List<SentenceSentiment> sentenceSentiments) {

final List<TextSentiment> sentenceSentimentCollection = new ArrayList<>();

sentenceSentiments.stream().forEach(sentenceSentiment -> {

final TextSentiment singleSentenceSentiment = new TextSentiment();

singleSentenceSentiment.setLength(Integer.toString(sentenceSentiment.getLength()));
singleSentenceSentiment.setLength(Integer.toString(sentenceSentiment.getOffset()));
final TextSentimentClass sentimentClass = convertToTextSentimentClass(sentenceSentiment.getSentiment());
Expand All @@ -1073,11 +1076,9 @@ private List<TextSentiment> convertToSentenceSentiments(final List<SentenceSenti
// sentenceSentiment.getWarnings();
sentenceSentimentCollection.add(singleSentenceSentiment);
});

return sentenceSentimentCollection;
}


private void setTextSentimentScore(final SentimentConfidenceScorePerLabel sentimentScore,
final TextSentimentClass textSentimentClass, final TextSentiment textSentimentResult) {
switch (textSentimentClass) {
Expand Down Expand Up @@ -1122,5 +1123,4 @@ private TextSentimentResult convertToErrorTextSentimentResult(final DocumentErro
.setTarget(serviceError.getTarget());
return new TextSentimentResult(documentError.getId(), error, true);
}

}

0 comments on commit 5f5c198

Please sign in to comment.