Skip to content

Commit b40c291

Browse files
gguussgguuss
committed
Updates to address API changes for analyzeSyntax. Will need an update to pom.xml when the updated client library is published.
1 parent 8539683 commit b40c291

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

‎language/analysis/src/main/java/com/google/cloud/language/samples/Analyze.java

+21-21
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,21 @@
2222
import com.google.api.client.http.HttpRequestInitializer;
2323
import com.google.api.client.json.JsonFactory;
2424
import com.google.api.client.json.jackson2.JacksonFactory;
25-
import com.google.api.services.language.v1beta1.CloudNaturalLanguageAPI;
26-
import com.google.api.services.language.v1beta1.CloudNaturalLanguageAPIScopes;
27-
import com.google.api.services.language.v1beta1.model.AnalyzeEntitiesRequest;
28-
import com.google.api.services.language.v1beta1.model.AnalyzeEntitiesResponse;
29-
import com.google.api.services.language.v1beta1.model.AnalyzeSentimentRequest;
30-
import com.google.api.services.language.v1beta1.model.AnalyzeSentimentResponse;
31-
import com.google.api.services.language.v1beta1.model.AnnotateTextRequest;
32-
import com.google.api.services.language.v1beta1.model.AnnotateTextResponse;
33-
import com.google.api.services.language.v1beta1.model.Document;
34-
import com.google.api.services.language.v1beta1.model.Entity;
35-
import com.google.api.services.language.v1beta1.model.Features;
36-
import com.google.api.services.language.v1beta1.model.Sentiment;
37-
import com.google.api.services.language.v1beta1.model.Token;
25+
import com.google.api.services.language.v1.CloudNaturalLanguageAPI;
26+
import com.google.api.services.language.v1.CloudNaturalLanguageAPIScopes;
27+
import com.google.api.services.language.v1.model.AnalyzeEntitiesRequest;
28+
import com.google.api.services.language.v1.model.AnalyzeEntitiesResponse;
29+
import com.google.api.services.language.v1.model.AnalyzeSentimentRequest;
30+
import com.google.api.services.language.v1.model.AnalyzeSentimentResponse;
31+
import com.google.api.services.language.v1.model.AnalyzeSyntaxRequest;
32+
import com.google.api.services.language.v1.model.AnalyzeSyntaxResponse;
33+
import com.google.api.services.language.v1.model.AnnotateTextRequest;
34+
import com.google.api.services.language.v1.model.AnnotateTextResponse;
35+
import com.google.api.services.language.v1.model.Document;
36+
import com.google.api.services.language.v1.model.Entity;
37+
import com.google.api.services.language.v1.model.Features;
38+
import com.google.api.services.language.v1.model.Sentiment;
39+
import com.google.api.services.language.v1.model.Token;
3840

3941
import java.io.IOException;
4042
import java.io.PrintStream;
@@ -136,7 +138,7 @@ public static void printSyntax(PrintStream out, List<Token> tokens) {
136138
/**
137139
* Connects to the Natural Language API using Application Default Credentials.
138140
*/
139-
public static CloudNaturalLanguageAPI getLanguageService()
141+
public static CloudNaturalLanguageAPI getLanguageService()
140142
throws IOException, GeneralSecurityException {
141143
GoogleCredential credential =
142144
GoogleCredential.getApplicationDefault().createScoped(CloudNaturalLanguageAPIScopes.all());
@@ -195,15 +197,13 @@ public Sentiment analyzeSentiment(String text) throws IOException {
195197
* Gets {@link Token}s from the string {@code text}.
196198
*/
197199
public List<Token> analyzeSyntax(String text) throws IOException {
198-
AnnotateTextRequest request =
199-
new AnnotateTextRequest()
200+
AnalyzeSyntaxRequest request =
201+
new AnalyzeSyntaxRequest()
200202
.setDocument(new Document().setContent(text).setType("PLAIN_TEXT"))
201-
.setFeatures(new Features().setExtractSyntax(true))
202203
.setEncodingType("UTF16");
203-
CloudNaturalLanguageAPI.Documents.AnnotateText analyze =
204-
languageApi.documents().annotateText(request);
205-
206-
AnnotateTextResponse response = analyze.execute();
204+
CloudNaturalLanguageAPI.Documents.AnalyzeSyntax analyze =
205+
languageApi.documents().analyzeSyntax(request);
206+
AnalyzeSyntaxResponse response = analyze.execute();
207207
return response.getTokens();
208208
}
209209
}

‎language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeIT.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020

21-
import com.google.api.services.language.v1beta1.model.Entity;
22-
import com.google.api.services.language.v1beta1.model.Sentiment;
23-
import com.google.api.services.language.v1beta1.model.Token;
21+
import com.google.api.services.language.v1.model.Entity;
22+
import com.google.api.services.language.v1.model.Sentiment;
23+
import com.google.api.services.language.v1.model.Token;
2424

2525
import org.junit.Before;
2626
import org.junit.Test;
@@ -59,10 +59,10 @@ public class AnalyzeIT {
5959

6060
@Test public void analyzeSentiment_returnPositive() throws Exception {
6161
// Act
62-
Sentiment sentiment =
62+
Sentiment sentiment =
6363
analyzeApp.analyzeSentiment(
6464
"Tom Cruise is one of the finest actors in hollywood and a great star!");
65-
65+
6666
// Assert
6767
assertThat((double)sentiment.getMagnitude()).isGreaterThan(0.0);
6868
assertThat((double)sentiment.getPolarity()).isGreaterThan(0.0);
@@ -89,7 +89,7 @@ public class AnalyzeIT {
8989
.collect(Collectors.toList());
9090

9191
// Assert
92-
assertThat(got).containsExactly("NOUN", "NOUN", "VERB",
92+
assertThat(got).containsExactly("NOUN", "NOUN", "VERB",
9393
"VERB", "ADP", "DET", "ADJ", "NOUN").inOrder();
9494
}
9595
}

‎language/analysis/src/test/java/com/google/cloud/language/samples/AnalyzeTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import static com.google.common.truth.Truth.assertThat;
2020

21-
import com.google.api.services.language.v1beta1.model.Entity;
21+
import com.google.api.services.language.v1.model.Entity;
2222
import com.google.common.collect.ImmutableList;
2323
import com.google.common.collect.ImmutableMap;
2424

0 commit comments

Comments
 (0)