Skip to content

Commit f78179f

Browse files
bug: fix importData sample in order to bump libraries-bom version (#3011)
Fixes #2943
1 parent d4a4ec4 commit f78179f

File tree

3 files changed

+21
-5
lines changed

3 files changed

+21
-5
lines changed

vision/automl/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
<dependency>
4444
<groupId>com.google.cloud</groupId>
4545
<artifactId>libraries-bom</artifactId>
46-
<version>4.4.1</version>
46+
<version>5.5.0</version>
4747
<type>pom</type>
4848
<scope>import</scope>
4949
</dependency>

vision/automl/src/main/java/com/google/cloud/vision/samples/automl/DatasetApi.java

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.google.cloud.vision.samples.automl;
1818

1919
// Imports the Google Cloud client library
20+
import com.google.api.gax.longrunning.OperationFuture;
2021
import com.google.cloud.automl.v1beta1.AutoMlClient;
2122
import com.google.cloud.automl.v1beta1.ClassificationProto.ClassificationType;
2223
import com.google.cloud.automl.v1beta1.Dataset;
@@ -27,10 +28,13 @@
2728
import com.google.cloud.automl.v1beta1.InputConfig;
2829
import com.google.cloud.automl.v1beta1.ListDatasetsRequest;
2930
import com.google.cloud.automl.v1beta1.LocationName;
31+
import com.google.cloud.automl.v1beta1.OperationMetadata;
3032
import com.google.cloud.automl.v1beta1.OutputConfig;
3133
import com.google.protobuf.Empty;
3234
import java.io.IOException;
3335
import java.util.concurrent.ExecutionException;
36+
import java.util.concurrent.TimeUnit;
37+
import java.util.concurrent.TimeoutException;
3438
import net.sourceforge.argparse4j.ArgumentParsers;
3539
import net.sourceforge.argparse4j.inf.ArgumentParser;
3640
import net.sourceforge.argparse4j.inf.ArgumentParserException;
@@ -211,9 +215,21 @@ static void importData(String projectId, String computeRegion, String datasetId,
211215
// Import data from the input URI
212216
InputConfig inputConfig = InputConfig.newBuilder().setGcsSource(gcsSource).build();
213217
System.out.println("Processing import...");
214-
Empty response = client.importDataAsync(datasetFullId.toString(), inputConfig).get();
215-
System.out.println(String.format("Dataset imported. %s", response));
216-
} catch (IOException | InterruptedException | ExecutionException e) {
218+
219+
// Start the import job
220+
OperationFuture<Empty, OperationMetadata> operation =
221+
client.importDataAsync(datasetFullId, inputConfig);
222+
223+
// More info on gax longrunning Operation:
224+
// http://googleapis.github.io/gax-java/1.4.1/apidocs/com/google/api/gax/grpc/OperationFuture.html
225+
System.out.format("Operation name: %s%n", operation.getName());
226+
227+
// If you want to wait for the operation to finish, adjust the timeout appropriately. The
228+
// operation will still run if you choose not to wait for it to complete. You can check the
229+
// status of your operation using the operation's name.
230+
Empty response = operation.get(5, TimeUnit.MINUTES);
231+
System.out.format("Dataset imported. %s%n", response);
232+
} catch (IOException | InterruptedException | ExecutionException | TimeoutException e) {
217233
e.printStackTrace();
218234
}
219235
}

vision/automl/src/test/java/com/google/cloud/vision/samples/automl/DatasetApiIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ public void testCreateImportDeleteDataset() {
7171

7272
// Act
7373
DatasetApi.importData(
74-
PROJECT_ID, COMPUTE_REGION, datasetId, "gs://" + BUCKET + "/flower_traindata.csv");
74+
PROJECT_ID, COMPUTE_REGION, datasetId, "gs://" + BUCKET + "/flower_traindata_concise.csv");
7575

7676
// Assert
7777
got = bout.toString();

0 commit comments

Comments
 (0)