Skip to content

Commit f74173b

Browse files
authored
Merge pull request #376 from GoogleCloudPlatform/nl15
Address changes for analyzeSyntax.
2 parents 152b20b + 880b7e5 commit f74173b

File tree

5 files changed

+50
-31
lines changed

5 files changed

+50
-31
lines changed

language/analysis/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ three values `entities`, `sentiment` or `syntax`.
3434

3535
```
3636
MAIN_CLASS=com.google.cloud.language.samples.Analyze
37-
JAR_FILE=target/entities-1.0-SNAPSHOT-jar-with-dependencies.jar
37+
JAR_FILE=target/language-entities-1.0-jar-with-dependencies.jar
3838
java -cp $JAR_FILE $MAIN_CLASS <sentiment|entities|syntax> <text>
3939
```
4040

language/analysis/pom.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ limitations under the License.
1616
<project>
1717
<modelVersion>4.0.0</modelVersion>
1818
<packaging>jar</packaging>
19-
<version>1.0-SNAPSHOT</version>
19+
<version>1.0</version>
2020
<groupId>com.google.cloud.language.samples</groupId>
2121
<artifactId>language-entities</artifactId>
2222

@@ -25,12 +25,12 @@ limitations under the License.
2525
<dependency>
2626
<groupId>com.google.apis</groupId>
2727
<artifactId>google-api-services-language</artifactId>
28-
<version>v1beta1-rev14-1.22.0</version>
28+
<version>v1-rev1-1.21.0</version>
2929
</dependency>
3030
<dependency>
3131
<groupId>com.google.api-client</groupId>
3232
<artifactId>google-api-client</artifactId>
33-
<version>1.22.0</version>
33+
<version>1.21.0</version>
3434
</dependency>
3535
<dependency>
3636
<groupId>com.google.guava</groupId>

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

+40-21
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,22 @@
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.CloudNaturalLanguage;
26-
import com.google.api.services.language.v1beta1.CloudNaturalLanguageScopes;
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.CloudNaturalLanguage;
26+
import com.google.api.services.language.v1.CloudNaturalLanguageScopes;
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.EntityMention;
38+
import com.google.api.services.language.v1.model.Features;
39+
import com.google.api.services.language.v1.model.Sentiment;
40+
import com.google.api.services.language.v1.model.Token;
3841

3942
import java.io.IOException;
4043
import java.io.PrintStream;
@@ -99,6 +102,13 @@ public static void printEntities(PrintStream out, List<Entity> entities) {
99102
out.printf("\tMetadata: %s = %s\n", metadata.getKey(), metadata.getValue());
100103
}
101104
}
105+
if (entity.getMentions() != null) {
106+
for (EntityMention mention : entity.getMentions()) {
107+
for (Map.Entry<String, Object> mentionSetMember : mention.entrySet()) {
108+
out.printf("\tMention: %s = %s\n", mentionSetMember.getKey(), mentionSetMember.getValue());
109+
}
110+
}
111+
}
102112
}
103113
}
104114

@@ -112,7 +122,7 @@ public static void printSentiment(PrintStream out, Sentiment sentiment) {
112122
}
113123
out.println("Found sentiment.");
114124
out.printf("\tMagnitude: %.3f\n", sentiment.getMagnitude());
115-
out.printf("\tPolarity: %.3f\n", sentiment.getPolarity());
125+
out.printf("\tScore: %.3f\n", sentiment.getScore());
116126
}
117127

118128
public static void printSyntax(PrintStream out, List<Token> tokens) {
@@ -127,6 +137,17 @@ public static void printSyntax(PrintStream out, List<Token> tokens) {
127137
out.printf("\tBeginOffset: %d\n", token.getText().getBeginOffset());
128138
out.printf("Lemma: %s\n", token.getLemma());
129139
out.printf("PartOfSpeechTag: %s\n", token.getPartOfSpeech().getTag());
140+
out.printf("\tAspect: %s\n",token.getPartOfSpeech().getAspect());
141+
out.printf("\tCase: %s\n", token.getPartOfSpeech().getCase());
142+
out.printf("\tForm: %s\n", token.getPartOfSpeech().getForm());
143+
out.printf("\tGender: %s\n",token.getPartOfSpeech().getGender());
144+
out.printf("\tMood: %s\n", token.getPartOfSpeech().getMood());
145+
out.printf("\tNumber: %s\n", token.getPartOfSpeech().getNumber());
146+
out.printf("\tPerson: %s\n", token.getPartOfSpeech().getPerson());
147+
out.printf("\tProper: %s\n", token.getPartOfSpeech().getProper());
148+
out.printf("\tReciprocity: %s\n", token.getPartOfSpeech().getReciprocity());
149+
out.printf("\tTense: %s\n", token.getPartOfSpeech().getTense());
150+
out.printf("\tVoice: %s\n", token.getPartOfSpeech().getVoice());
130151
out.println("DependencyEdge");
131152
out.printf("\tHeadTokenIndex: %d\n", token.getDependencyEdge().getHeadTokenIndex());
132153
out.printf("\tLabel: %s\n", token.getDependencyEdge().getLabel());
@@ -195,15 +216,13 @@ public Sentiment analyzeSentiment(String text) throws IOException {
195216
* Gets {@link Token}s from the string {@code text}.
196217
*/
197218
public List<Token> analyzeSyntax(String text) throws IOException {
198-
AnnotateTextRequest request =
199-
new AnnotateTextRequest()
219+
AnalyzeSyntaxRequest request =
220+
new AnalyzeSyntaxRequest()
200221
.setDocument(new Document().setContent(text).setType("PLAIN_TEXT"))
201-
.setFeatures(new Features().setExtractSyntax(true))
202222
.setEncodingType("UTF16");
203-
CloudNaturalLanguage.Documents.AnnotateText analyze =
204-
languageApi.documents().annotateText(request);
205-
206-
AnnotateTextResponse response = analyze.execute();
223+
CloudNaturalLanguage.Documents.AnalyzeSyntax analyze =
224+
languageApi.documents().analyzeSyntax(request);
225+
AnalyzeSyntaxResponse response = analyze.execute();
207226
return response.getTokens();
208227
}
209228
}

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

+5-5
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;
@@ -65,7 +65,7 @@ public class AnalyzeIT {
6565

6666
// Assert
6767
assertThat((double)sentiment.getMagnitude()).isGreaterThan(0.0);
68-
assertThat((double)sentiment.getPolarity()).isGreaterThan(0.0);
68+
assertThat((double)sentiment.getScore()).isGreaterThan(0.0);
6969
}
7070

7171
@Test public void analyzeSentiment_returnNegative() throws Exception {
@@ -76,7 +76,7 @@ public class AnalyzeIT {
7676

7777
// Assert
7878
assertThat((double)sentiment.getMagnitude()).isGreaterThan(0.0);
79-
assertThat((double)sentiment.getPolarity()).isLessThan(0.0);
79+
assertThat((double)sentiment.getScore()).isLessThan(0.0);
8080
}
8181

8282
@Test public void analyzeSyntax_partOfSpeech() throws Exception {

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)