Skip to content

Commit 432c46c

Browse files
authored
---
yaml --- r: 8309 b: refs/heads/master c: 8b85081 h: refs/heads/master i: 8307: ab0909f
1 parent 4cede66 commit 432c46c

13 files changed

Lines changed: 1087 additions & 32 deletions

File tree

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: d9978861d63b20ea59c2da6b099286ccb6a4aad0
2+
refs/heads/master: 8b850814d23f358bae61f5deaed071a3cf6fb6a6
33
refs/heads/travis: 47e4fee4fd5af9b2a8ce46f23c72ec95f9b195b2
44
refs/heads/gh-pages: 983ad13eceefeee06f3300486563b47902cedb77
55
refs/tags/0.0.9: 22f1839238f66c39e67ed4dfdcd273b1ae2e8444

trunk/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceClient.java

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -297,6 +297,88 @@ public final AnalyzeEntitiesResponse analyzeEntities(AnalyzeEntitiesRequest requ
297297
return stub.analyzeEntitiesCallable();
298298
}
299299

300+
// AUTO-GENERATED DOCUMENTATION AND METHOD
301+
/**
302+
* Finds entities, similar to
303+
* [AnalyzeEntities][google.cloud.language.v1.LanguageService.AnalyzeEntities] in the text and
304+
* analyzes sentiment associated with each entity and its mentions.
305+
*
306+
* <p>Sample code:
307+
*
308+
* <pre><code>
309+
* try (LanguageServiceClient languageServiceClient = LanguageServiceClient.create()) {
310+
* Document document = Document.newBuilder().build();
311+
* EncodingType encodingType = EncodingType.NONE;
312+
* AnalyzeEntitySentimentResponse response = languageServiceClient.analyzeEntitySentiment(document, encodingType);
313+
* }
314+
* </code></pre>
315+
*
316+
* @param document Input document.
317+
* @param encodingType The encoding type used by the API to calculate offsets.
318+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
319+
*/
320+
public final AnalyzeEntitySentimentResponse analyzeEntitySentiment(
321+
Document document, EncodingType encodingType) {
322+
323+
AnalyzeEntitySentimentRequest request =
324+
AnalyzeEntitySentimentRequest.newBuilder()
325+
.setDocument(document)
326+
.setEncodingType(encodingType)
327+
.build();
328+
return analyzeEntitySentiment(request);
329+
}
330+
331+
// AUTO-GENERATED DOCUMENTATION AND METHOD
332+
/**
333+
* Finds entities, similar to
334+
* [AnalyzeEntities][google.cloud.language.v1.LanguageService.AnalyzeEntities] in the text and
335+
* analyzes sentiment associated with each entity and its mentions.
336+
*
337+
* <p>Sample code:
338+
*
339+
* <pre><code>
340+
* try (LanguageServiceClient languageServiceClient = LanguageServiceClient.create()) {
341+
* Document document = Document.newBuilder().build();
342+
* AnalyzeEntitySentimentRequest request = AnalyzeEntitySentimentRequest.newBuilder()
343+
* .setDocument(document)
344+
* .build();
345+
* AnalyzeEntitySentimentResponse response = languageServiceClient.analyzeEntitySentiment(request);
346+
* }
347+
* </code></pre>
348+
*
349+
* @param request The request object containing all of the parameters for the API call.
350+
* @throws com.google.api.gax.rpc.ApiException if the remote call fails
351+
*/
352+
public final AnalyzeEntitySentimentResponse analyzeEntitySentiment(
353+
AnalyzeEntitySentimentRequest request) {
354+
return analyzeEntitySentimentCallable().call(request);
355+
}
356+
357+
// AUTO-GENERATED DOCUMENTATION AND METHOD
358+
/**
359+
* Finds entities, similar to
360+
* [AnalyzeEntities][google.cloud.language.v1.LanguageService.AnalyzeEntities] in the text and
361+
* analyzes sentiment associated with each entity and its mentions.
362+
*
363+
* <p>Sample code:
364+
*
365+
* <pre><code>
366+
* try (LanguageServiceClient languageServiceClient = LanguageServiceClient.create()) {
367+
* Document document = Document.newBuilder().build();
368+
* AnalyzeEntitySentimentRequest request = AnalyzeEntitySentimentRequest.newBuilder()
369+
* .setDocument(document)
370+
* .build();
371+
* ApiFuture&lt;AnalyzeEntitySentimentResponse&gt; future = languageServiceClient.analyzeEntitySentimentCallable().futureCall(request);
372+
* // Do something
373+
* AnalyzeEntitySentimentResponse response = future.get();
374+
* }
375+
* </code></pre>
376+
*/
377+
public final UnaryCallable<AnalyzeEntitySentimentRequest, AnalyzeEntitySentimentResponse>
378+
analyzeEntitySentimentCallable() {
379+
return stub.analyzeEntitySentimentCallable();
380+
}
381+
300382
// AUTO-GENERATED DOCUMENTATION AND METHOD
301383
/**
302384
* Analyzes the syntax of the text and provides sentence boundaries and tokenization along with

trunk/google-cloud-language/src/main/java/com/google/cloud/language/v1/LanguageServiceSettings.java

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,8 @@ public class LanguageServiceSettings extends ClientSettings {
9090
analyzeSentimentSettings;
9191
private final SimpleCallSettings<AnalyzeEntitiesRequest, AnalyzeEntitiesResponse>
9292
analyzeEntitiesSettings;
93+
private final SimpleCallSettings<AnalyzeEntitySentimentRequest, AnalyzeEntitySentimentResponse>
94+
analyzeEntitySentimentSettings;
9395
private final SimpleCallSettings<AnalyzeSyntaxRequest, AnalyzeSyntaxResponse>
9496
analyzeSyntaxSettings;
9597
private final SimpleCallSettings<AnnotateTextRequest, AnnotateTextResponse> annotateTextSettings;
@@ -106,6 +108,12 @@ public class LanguageServiceSettings extends ClientSettings {
106108
return analyzeEntitiesSettings;
107109
}
108110

111+
/** Returns the object with the settings used for calls to analyzeEntitySentiment. */
112+
public SimpleCallSettings<AnalyzeEntitySentimentRequest, AnalyzeEntitySentimentResponse>
113+
analyzeEntitySentimentSettings() {
114+
return analyzeEntitySentimentSettings;
115+
}
116+
109117
/** Returns the object with the settings used for calls to analyzeSyntax. */
110118
public SimpleCallSettings<AnalyzeSyntaxRequest, AnalyzeSyntaxResponse> analyzeSyntaxSettings() {
111119
return analyzeSyntaxSettings;
@@ -211,6 +219,7 @@ private LanguageServiceSettings(Builder settingsBuilder) throws IOException {
211219

212220
analyzeSentimentSettings = settingsBuilder.analyzeSentimentSettings().build();
213221
analyzeEntitiesSettings = settingsBuilder.analyzeEntitiesSettings().build();
222+
analyzeEntitySentimentSettings = settingsBuilder.analyzeEntitySentimentSettings().build();
214223
analyzeSyntaxSettings = settingsBuilder.analyzeSyntaxSettings().build();
215224
annotateTextSettings = settingsBuilder.annotateTextSettings().build();
216225
}
@@ -223,6 +232,9 @@ public static class Builder extends ClientSettings.Builder {
223232
analyzeSentimentSettings;
224233
private final SimpleCallSettings.Builder<AnalyzeEntitiesRequest, AnalyzeEntitiesResponse>
225234
analyzeEntitiesSettings;
235+
private final SimpleCallSettings.Builder<
236+
AnalyzeEntitySentimentRequest, AnalyzeEntitySentimentResponse>
237+
analyzeEntitySentimentSettings;
226238
private final SimpleCallSettings.Builder<AnalyzeSyntaxRequest, AnalyzeSyntaxResponse>
227239
analyzeSyntaxSettings;
228240
private final SimpleCallSettings.Builder<AnnotateTextRequest, AnnotateTextResponse>
@@ -272,6 +284,8 @@ private Builder(ClientContext clientContext) {
272284

273285
analyzeEntitiesSettings = SimpleCallSettings.newBuilder();
274286

287+
analyzeEntitySentimentSettings = SimpleCallSettings.newBuilder();
288+
275289
analyzeSyntaxSettings = SimpleCallSettings.newBuilder();
276290

277291
annotateTextSettings = SimpleCallSettings.newBuilder();
@@ -280,6 +294,7 @@ private Builder(ClientContext clientContext) {
280294
ImmutableList.<UnaryCallSettings.Builder>of(
281295
analyzeSentimentSettings,
282296
analyzeEntitiesSettings,
297+
analyzeEntitySentimentSettings,
283298
analyzeSyntaxSettings,
284299
annotateTextSettings);
285300

@@ -305,6 +320,11 @@ private static Builder initDefaults(Builder builder) {
305320
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
306321
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
307322

323+
builder
324+
.analyzeEntitySentimentSettings()
325+
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
326+
.setRetrySettings(RETRY_PARAM_DEFINITIONS.get("default"));
327+
308328
builder
309329
.analyzeSyntaxSettings()
310330
.setRetryableCodes(RETRYABLE_CODE_DEFINITIONS.get("idempotent"))
@@ -323,13 +343,15 @@ private Builder(LanguageServiceSettings settings) {
323343

324344
analyzeSentimentSettings = settings.analyzeSentimentSettings.toBuilder();
325345
analyzeEntitiesSettings = settings.analyzeEntitiesSettings.toBuilder();
346+
analyzeEntitySentimentSettings = settings.analyzeEntitySentimentSettings.toBuilder();
326347
analyzeSyntaxSettings = settings.analyzeSyntaxSettings.toBuilder();
327348
annotateTextSettings = settings.annotateTextSettings.toBuilder();
328349

329350
unaryMethodSettingsBuilders =
330351
ImmutableList.<UnaryCallSettings.Builder>of(
331352
analyzeSentimentSettings,
332353
analyzeEntitiesSettings,
354+
analyzeEntitySentimentSettings,
333355
analyzeSyntaxSettings,
334356
annotateTextSettings);
335357
}
@@ -375,6 +397,12 @@ public Builder applyToAllUnaryMethods(
375397
return analyzeEntitiesSettings;
376398
}
377399

400+
/** Returns the builder for the settings used for calls to analyzeEntitySentiment. */
401+
public SimpleCallSettings.Builder<AnalyzeEntitySentimentRequest, AnalyzeEntitySentimentResponse>
402+
analyzeEntitySentimentSettings() {
403+
return analyzeEntitySentimentSettings;
404+
}
405+
378406
/** Returns the builder for the settings used for calls to analyzeSyntax. */
379407
public SimpleCallSettings.Builder<AnalyzeSyntaxRequest, AnalyzeSyntaxResponse>
380408
analyzeSyntaxSettings() {

trunk/google-cloud-language/src/main/java/com/google/cloud/language/v1/PagedResponseWrappers.java

Lines changed: 0 additions & 29 deletions
This file was deleted.

trunk/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/GrpcLanguageServiceStub.java

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
import com.google.api.gax.rpc.UnaryCallable;
2424
import com.google.cloud.language.v1.AnalyzeEntitiesRequest;
2525
import com.google.cloud.language.v1.AnalyzeEntitiesResponse;
26+
import com.google.cloud.language.v1.AnalyzeEntitySentimentRequest;
27+
import com.google.cloud.language.v1.AnalyzeEntitySentimentResponse;
2628
import com.google.cloud.language.v1.AnalyzeSentimentRequest;
2729
import com.google.cloud.language.v1.AnalyzeSentimentResponse;
2830
import com.google.cloud.language.v1.AnalyzeSyntaxRequest;
@@ -63,6 +65,16 @@ public class GrpcLanguageServiceStub extends LanguageServiceStub {
6365
AnalyzeEntitiesRequest.getDefaultInstance()),
6466
io.grpc.protobuf.ProtoUtils.marshaller(
6567
AnalyzeEntitiesResponse.getDefaultInstance())));
68+
private static final UnaryCallable<AnalyzeEntitySentimentRequest, AnalyzeEntitySentimentResponse>
69+
directAnalyzeEntitySentimentCallable =
70+
GrpcCallableFactory.createDirectCallable(
71+
io.grpc.MethodDescriptor.create(
72+
io.grpc.MethodDescriptor.MethodType.UNARY,
73+
"google.cloud.language.v1.LanguageService/AnalyzeEntitySentiment",
74+
io.grpc.protobuf.ProtoUtils.marshaller(
75+
AnalyzeEntitySentimentRequest.getDefaultInstance()),
76+
io.grpc.protobuf.ProtoUtils.marshaller(
77+
AnalyzeEntitySentimentResponse.getDefaultInstance())));
6678
private static final UnaryCallable<AnalyzeSyntaxRequest, AnalyzeSyntaxResponse>
6779
directAnalyzeSyntaxCallable =
6880
GrpcCallableFactory.createDirectCallable(
@@ -88,6 +100,8 @@ public class GrpcLanguageServiceStub extends LanguageServiceStub {
88100
analyzeSentimentCallable;
89101
private final UnaryCallable<AnalyzeEntitiesRequest, AnalyzeEntitiesResponse>
90102
analyzeEntitiesCallable;
103+
private final UnaryCallable<AnalyzeEntitySentimentRequest, AnalyzeEntitySentimentResponse>
104+
analyzeEntitySentimentCallable;
91105
private final UnaryCallable<AnalyzeSyntaxRequest, AnalyzeSyntaxResponse> analyzeSyntaxCallable;
92106
private final UnaryCallable<AnnotateTextRequest, AnnotateTextResponse> annotateTextCallable;
93107

@@ -115,6 +129,11 @@ protected GrpcLanguageServiceStub(LanguageServiceSettings settings, ClientContex
115129
this.analyzeEntitiesCallable =
116130
GrpcCallableFactory.create(
117131
directAnalyzeEntitiesCallable, settings.analyzeEntitiesSettings(), clientContext);
132+
this.analyzeEntitySentimentCallable =
133+
GrpcCallableFactory.create(
134+
directAnalyzeEntitySentimentCallable,
135+
settings.analyzeEntitySentimentSettings(),
136+
clientContext);
118137
this.analyzeSyntaxCallable =
119138
GrpcCallableFactory.create(
120139
directAnalyzeSyntaxCallable, settings.analyzeSyntaxSettings(), clientContext);
@@ -134,6 +153,11 @@ public UnaryCallable<AnalyzeEntitiesRequest, AnalyzeEntitiesResponse> analyzeEnt
134153
return analyzeEntitiesCallable;
135154
}
136155

156+
public UnaryCallable<AnalyzeEntitySentimentRequest, AnalyzeEntitySentimentResponse>
157+
analyzeEntitySentimentCallable() {
158+
return analyzeEntitySentimentCallable;
159+
}
160+
137161
public UnaryCallable<AnalyzeSyntaxRequest, AnalyzeSyntaxResponse> analyzeSyntaxCallable() {
138162
return analyzeSyntaxCallable;
139163
}

trunk/google-cloud-language/src/main/java/com/google/cloud/language/v1/stub/LanguageServiceStub.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import com.google.api.gax.rpc.UnaryCallable;
2121
import com.google.cloud.language.v1.AnalyzeEntitiesRequest;
2222
import com.google.cloud.language.v1.AnalyzeEntitiesResponse;
23+
import com.google.cloud.language.v1.AnalyzeEntitySentimentRequest;
24+
import com.google.cloud.language.v1.AnalyzeEntitySentimentResponse;
2325
import com.google.cloud.language.v1.AnalyzeSentimentRequest;
2426
import com.google.cloud.language.v1.AnalyzeSentimentResponse;
2527
import com.google.cloud.language.v1.AnalyzeSyntaxRequest;
@@ -47,6 +49,11 @@ public UnaryCallable<AnalyzeEntitiesRequest, AnalyzeEntitiesResponse> analyzeEnt
4749
throw new UnsupportedOperationException("Not implemented: analyzeEntitiesCallable()");
4850
}
4951

52+
public UnaryCallable<AnalyzeEntitySentimentRequest, AnalyzeEntitySentimentResponse>
53+
analyzeEntitySentimentCallable() {
54+
throw new UnsupportedOperationException("Not implemented: analyzeEntitySentimentCallable()");
55+
}
56+
5057
public UnaryCallable<AnalyzeSyntaxRequest, AnalyzeSyntaxResponse> analyzeSyntaxCallable() {
5158
throw new UnsupportedOperationException("Not implemented: analyzeSyntaxCallable()");
5259
}

trunk/google-cloud-video-intelligence/pom.xml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<version>0.23.2-alpha-SNAPSHOT</version>
1616
</parent>
1717
<properties>
18-
<site.installationModule>google-cloud-video-intelligence-v1beta1</site.installationModule>
18+
<site.installationModule>google-cloud-video-intelligence</site.installationModule>
1919
<artifact.version>${project.version}</artifact.version>
2020
</properties>
2121
<dependencies>
@@ -36,6 +36,10 @@
3636
<groupId>com.google.api.grpc</groupId>
3737
<artifactId>proto-google-cloud-video-intelligence-v1beta1</artifactId>
3838
</dependency>
39+
<dependency>
40+
<groupId>com.google.api.grpc</groupId>
41+
<artifactId>proto-google-cloud-video-intelligence-v1beta2</artifactId>
42+
</dependency>
3943
<dependency>
4044
<groupId>io.grpc</groupId>
4145
<artifactId>grpc-netty</artifactId>
@@ -74,6 +78,11 @@
7478
<artifactId>grpc-google-cloud-video-intelligence-v1beta1</artifactId>
7579
<scope>test</scope>
7680
</dependency>
81+
<dependency>
82+
<groupId>com.google.api.grpc</groupId>
83+
<artifactId>grpc-google-cloud-video-intelligence-v1beta2</artifactId>
84+
<scope>test</scope>
85+
</dependency>
7786
</dependencies>
7887
<profiles>
7988
<profile>

0 commit comments

Comments
 (0)