Fixed OperationalFuture references.

GoogleCloudPlatform · Nov 14, 2017 · 3419fb6 · 3419fb6
1 parent 31732ef
commit 3419fb6
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 24 deletions.
diff --git a/dlp/src/main/java/com/example/dlp/Inspect.java b/dlp/src/main/java/com/example/dlp/Inspect.java
@@ -16,7 +16,7 @@
 
 package com.example.dlp;
 
-import com.google.api.gax.rpc.OperationFuture;
+import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.dlp.v2beta1.DlpServiceClient;
 import com.google.longrunning.Operation;
@@ -235,7 +235,7 @@ private static void inspectGcsFile(
       OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
 
       // asynchronously submit an inspect operation
-      OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation> responseFuture =
+      OperationFuture<InspectOperationResult, InspectOperationMetadata> responseFuture =
           dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig);
 
       // ...
@@ -309,7 +309,7 @@ private static void inspectDatastore(
       OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
 
       // asynchronously submit an inspect operation
-      OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation> responseFuture =
+      OperationFuture<InspectOperationResult, InspectOperationMetadata> responseFuture =
           dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig);
 
       // ...
@@ -387,7 +387,7 @@ private static void inspectBigquery(
       OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
 
       // asynchronously submit an inspect operation
-      OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation> responseFuture =
+      OperationFuture<InspectOperationResult, InspectOperationMetadata> responseFuture =
               dlpServiceClient.createInspectOperationAsync(
                   inspectConfig, storageConfig, outputConfig);
 

diff --git a/dlp/src/main/java/com/example/dlp/RiskAnalysis.java b/dlp/src/main/java/com/example/dlp/RiskAnalysis.java
@@ -16,7 +16,7 @@
 
 package com.example.dlp;
 
-import com.google.api.gax.rpc.OperationFuture;
+import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.dlp.v2beta1.DlpServiceClient;
 import com.google.longrunning.Operation;
@@ -102,7 +102,7 @@ private static void calculateNumericalStats(
               .build();
 
       // asynchronously submit a risk analysis operation
-      OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
+      OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
           responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request);
 
       // ...
@@ -180,7 +180,7 @@ private static void calculateCategoricalStats(
               .build();
 
       // asynchronously submit a risk analysis operation
-      OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
+      OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
           responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request);
 
       // ...
@@ -259,7 +259,7 @@ private static void calculateKAnonymity(
               .build();
 
       // asynchronously submit a risk analysis operation
-      OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
+      OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
           responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request);
 
       // ...
@@ -352,7 +352,7 @@ private static void calculateLDiversity(
               .build();
 
       // asynchronously submit a risk analysis operation
-      OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata, Operation>
+      OperationFuture<RiskAnalysisOperationResult, RiskAnalysisOperationMetadata>
           responseFuture = dlpServiceClient.analyzeDataSourceRiskAsync(request);
 
       // ...

diff --git a/speech/cloud-client/src/main/java/com/example/speech/Recognize.java b/speech/cloud-client/src/main/java/com/example/speech/Recognize.java
@@ -18,7 +18,7 @@
 
 import com.google.api.gax.rpc.ApiStreamObserver;
 import com.google.api.gax.rpc.BidiStreamingCallable;
-import com.google.api.gax.rpc.OperationFuture;
+import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.speech.v1.LongRunningRecognizeMetadata;
 import com.google.cloud.speech.v1.LongRunningRecognizeResponse;
 import com.google.cloud.speech.v1.RecognitionAudio;
@@ -34,7 +34,6 @@
 import com.google.cloud.speech.v1.StreamingRecognizeResponse;
 import com.google.cloud.speech.v1.WordInfo;
 import com.google.common.util.concurrent.SettableFuture;
-import com.google.longrunning.Operation;
 import com.google.protobuf.ByteString;
 import java.io.IOException;
 import java.nio.file.Files;
@@ -221,8 +220,7 @@ public static void asyncRecognizeFile(String fileName) throws Exception, IOExcep
         .build();
 
     // Use non-blocking call for getting file transcription
-    OperationFuture<LongRunningRecognizeResponse, LongRunningRecognizeMetadata,
-            Operation> response =
+    OperationFuture<LongRunningRecognizeResponse, LongRunningRecognizeMetadata> response =
         speech.longRunningRecognizeAsync(config, audio);
 
     while (!response.isDone()) {
@@ -263,8 +261,7 @@ public static void asyncRecognizeWords(String gcsUri) throws Exception, IOExcept
         .build();
 
     // Use non-blocking call for getting file transcription
-    OperationFuture<LongRunningRecognizeResponse, LongRunningRecognizeMetadata,
-            Operation> response =
+    OperationFuture<LongRunningRecognizeResponse, LongRunningRecognizeMetadata> response =
         speech.longRunningRecognizeAsync(config, audio);
     while (!response.isDone()) {
       System.out.println("Waiting for response...");
@@ -311,8 +308,7 @@ public static void asyncRecognizeGcs(String gcsUri) throws Exception, IOExceptio
         .build();
 
     // Use non-blocking call for getting file transcription
-    OperationFuture<LongRunningRecognizeResponse, LongRunningRecognizeMetadata,
-            Operation> response =
+    OperationFuture<LongRunningRecognizeResponse, LongRunningRecognizeMetadata> response =
         speech.longRunningRecognizeAsync(config, audio);
     while (!response.isDone()) {
       System.out.println("Waiting for response...");

diff --git a/video/cloud-client/src/main/java/com/example/video/Detect.java b/video/cloud-client/src/main/java/com/example/video/Detect.java
@@ -16,7 +16,7 @@
 
 package com.example.video;
 
-import com.google.api.gax.rpc.OperationFuture;
+import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress;
 import com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest;
 import com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse;
@@ -113,7 +113,7 @@ public static void analyzeFaces(String gcsUri) throws Exception {
           .build();
 
       // asynchronously perform facial analysis on videos
-      OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> response
+      OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> response
           = client.annotateVideoAsync(request);
 
       boolean faceFound = false;
@@ -174,7 +174,7 @@ public static void analyzeLabels(String gcsUri) throws Exception {
           .addFeatures(Feature.LABEL_DETECTION)
           .build();
       // Create an operation that will contain the response when the operation completes.
-      OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> operation =
+      OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> operation =
           client.annotateVideoAsync(request);
 
       System.out.println("Waiting for operation to complete...");
@@ -261,7 +261,7 @@ public static void analyzeLabelsFile(String filePath) throws Exception {
           .build();
 
       // Create an operation that will contain the response when the operation completes.
-      OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> operation =
+      OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> operation =
           client.annotateVideoAsync(request);
 
       System.out.println("Waiting for operation to complete...");
@@ -344,7 +344,7 @@ public static void analyzeShots(String gcsUri) throws Exception {
           .build();
 
       // Create an operation that will contain the response when the operation completes.
-      OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> operation =
+      OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> operation =
           client.annotateVideoAsync(request);
       System.out.println("Waiting for operation to complete...");
 
@@ -382,7 +382,7 @@ public static void analyzeExplicitContent(String gcsUri) throws Exception {
           .addFeatures(Feature.EXPLICIT_CONTENT_DETECTION)
           .build();
 
-      OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress, Operation> operation =
+      OperationFuture<AnnotateVideoResponse, AnnotateVideoProgress> operation =
           client.annotateVideoAsync(request);
 
       System.out.println("Waiting for operation to complete...");

diff --git a/video/cloud-client/src/main/java/com/example/video/QuickstartSample.java b/video/cloud-client/src/main/java/com/example/video/QuickstartSample.java
@@ -18,7 +18,7 @@
 
 // [START videointelligence_quickstart]
 
-import com.google.api.gax.rpc.OperationFuture;
+import com.google.api.gax.longrunning.OperationFuture;
 import com.google.cloud.videointelligence.v1beta2.AnnotateVideoProgress;
 import com.google.cloud.videointelligence.v1beta2.AnnotateVideoRequest;
 import com.google.cloud.videointelligence.v1beta2.AnnotateVideoResponse;