Skip to content

Commit ada14ac

Browse files
committed
Fixed OperationalFuture references.
1 parent bbc6669 commit ada14ac

File tree

5 files changed

+20
-24
lines changed

5 files changed

+20
-24
lines changed

dlp/src/main/java/com/example/dlp/Inspect.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.example.dlp;
1818

19-
import com.google.api.gax.rpc.OperationFuture;
19+
import com.google.api.gax.longrunning.OperationFuture;
2020
import com.google.cloud.ServiceOptions;
2121
import com.google.cloud.dlp.v2beta1.DlpServiceClient;
2222
import com.google.longrunning.Operation;
@@ -235,7 +235,7 @@ private static void inspectGcsFile(
235235
OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
236236

237237
// asynchronously submit an inspect operation
238-
OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation> responseFuture =
238+
OperationFuture<InspectOperationResult, InspectOperationMetadata> responseFuture =
239239
dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig);
240240

241241
// ...
@@ -309,7 +309,7 @@ private static void inspectDatastore(
309309
OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
310310

311311
// asynchronously submit an inspect operation
312-
OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation> responseFuture =
312+
OperationFuture<InspectOperationResult, InspectOperationMetadata> responseFuture =
313313
dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig);
314314

315315
// ...
@@ -387,7 +387,7 @@ private static void inspectBigquery(
387387
OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
388388

389389
// asynchronously submit an inspect operation
390-
OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation> responseFuture =
390+
OperationFuture<InspectOperationResult, InspectOperationMetadata> responseFuture =
391391
dlpServiceClient.createInspectOperationAsync(
392392
inspectConfig, storageConfig, outputConfig);
393393

dlp/src/main/java/com/example/dlp/RiskAnalysis.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.example.dlp;
1818

19-
import com.google.api.gax.rpc.OperationFuture;
19+
import com.google.api.gax.longrunning.OperationFuture;
2020
import com.google.cloud.ServiceOptions;
2121
import com.google.cloud.dlp.v2beta1.DlpServiceClient;
2222
import com.google.longrunning.Operation;
@@ -102,7 +102,7 @@ private static void calculateNumericalStats(
102102
.build();
103103

104104
// asynchronously submit a risk analysis operation
105-
OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
105+
OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
106106
responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request);
107107

108108
// ...
@@ -180,7 +180,7 @@ private static void calculateCategoricalStats(
180180
.build();
181181

182182
// asynchronously submit a risk analysis operation
183-
OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
183+
OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
184184
responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request);
185185

186186
// ...
@@ -259,7 +259,7 @@ private static void calculateKAnonymity(
259259
.build();
260260

261261
// asynchronously submit a risk analysis operation
262-
OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
262+
OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
263263
responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request);
264264

265265
// ...
@@ -352,7 +352,7 @@ private static void calculateLDiversity(
352352
.build();
353353

354354
// asynchronously submit a risk analysis operation
355-
OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
355+
OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
356356
responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request);
357357

358358
// ...

speech/cloud-client/src/main/java/com/example/speech/Recognize.java

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.google.api.gax.rpc.ApiStreamObserver;
2020
import com.google.api.gax.rpc.BidiStreamingCallable;
21-
import com.google.api.gax.rpc.OperationFuture;
21+
import com.google.api.gax.longrunning.OperationFuture;
2222
import com.google.cloud.speech.v1.LongRunningRecognizeMetadata;
2323
import com.google.cloud.speech.v1.LongRunningRecognizeResponse;
2424
import com.google.cloud.speech.v1.RecognitionAudio;
@@ -34,7 +34,6 @@
3434
import com.google.cloud.speech.v1.StreamingRecognizeResponse;
3535
import com.google.cloud.speech.v1.WordInfo;
3636
import com.google.common.util.concurrent.SettableFuture;
37-
import com.google.longrunning.Operation;
3837
import com.google.protobuf.ByteString;
3938
import java.io.IOException;
4039
import java.nio.file.Files;
@@ -221,8 +220,7 @@ public static void asyncRecognizeFile(String fileName) throws Exception, IOExcep
221220
.build();
222221

223222
// Use non-blocking call for getting file transcription
224-
OperationFuture<LongRunningRecognizeResponse, LongRunningRecognizeMetadata,
225-
Operation> response =
223+
OperationFuture<LongRunningRecognizeResponse, LongRunningRecognizeMetadata> response =
226224
speech.longRunningRecognizeAsync(config, audio);
227225

228226
while (!response.isDone()) {
@@ -263,8 +261,7 @@ public static void asyncRecognizeWords(String gcsUri) throws Exception, IOExcept
263261
.build();
264262

265263
// Use non-blocking call for getting file transcription
266-
OperationFuture<LongRunningRecognizeResponse, LongRunningRecognizeMetadata,
267-
Operation> response =
264+
OperationFuture<LongRunningRecognizeResponse, LongRunningRecognizeMetadata> response =
268265
speech.longRunningRecognizeAsync(config, audio);
269266
while (!response.isDone()) {
270267
System.out.println("Waiting for response...");
@@ -311,8 +308,7 @@ public static void asyncRecognizeGcs(String gcsUri) throws Exception, IOExceptio
311308
.build();
312309

313310
// Use non-blocking call for getting file transcription
314-
OperationFuture<LongRunningRecognizeResponse, LongRunningRecognizeMetadata,
315-
Operation> response =
311+
OperationFuture<LongRunningRecognizeResponse, LongRunningRecognizeMetadata> response =
316312
speech.longRunningRecognizeAsync(config, audio);
317313
while (!response.isDone()) {
318314
System.out.println("Waiting for response...");

video/cloud-client/src/main/java/com/example/video/Detect.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package com.example.video;
1818

19-
import com.google.api.gax.rpc.OperationFuture;
19+
import com.google.api.gax.longrunning.OperationFuture;
2020
import com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress;
2121
import com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest;
2222
import com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse;
@@ -113,7 +113,7 @@ public static void analyzeFaces(String gcsUri) throws Exception {
113113
.build();
114114

115115
// asynchronously perform facial analysis on videos
116-
OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> response
116+
OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> response
117117
= client.annotateVideoAsync(request);
118118

119119
boolean faceFound = false;
@@ -174,7 +174,7 @@ public static void analyzeLabels(String gcsUri) throws Exception {
174174
.addFeatures(Feature.LABEL_DETECTION)
175175
.build();
176176
// Create an operation that will contain the response when the operation completes.
177-
OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> operation =
177+
OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> operation =
178178
client.annotateVideoAsync(request);
179179

180180
System.out.println("Waiting for operation to complete...");
@@ -261,7 +261,7 @@ public static void analyzeLabelsFile(String filePath) throws Exception {
261261
.build();
262262

263263
// Create an operation that will contain the response when the operation completes.
264-
OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> operation =
264+
OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> operation =
265265
client.annotateVideoAsync(request);
266266

267267
System.out.println("Waiting for operation to complete...");
@@ -344,7 +344,7 @@ public static void analyzeShots(String gcsUri) throws Exception {
344344
.build();
345345

346346
// Create an operation that will contain the response when the operation completes.
347-
OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> operation =
347+
OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> operation =
348348
client.annotateVideoAsync(request);
349349
System.out.println("Waiting for operation to complete...");
350350

@@ -382,7 +382,7 @@ public static void analyzeExplicitContent(String gcsUri) throws Exception {
382382
.addFeatures(Feature.EXPLICIT_CONTENT_DETECTION)
383383
.build();
384384

385-
OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> operation =
385+
OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> operation =
386386
client.annotateVideoAsync(request);
387387

388388
System.out.println("Waiting for operation to complete...");

video/cloud-client/src/main/java/com/example/video/QuickstartSample.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
// [START videointelligence_quickstart]
2020

21-
import com.google.api.gax.rpc.OperationFuture;
21+
import com.google.api.gax.longrunning.OperationFuture;
2222
import com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress;
2323
import com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest;
2424
import com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse;

0 commit comments

Comments
 (0)