From 86246db4a373d6a051de4350a9f24686dba34cfc Mon Sep 17 00:00:00 2001
From: Jisha Abubaker <jishaa@google.com>
Date: Fri, 28 Jul 2017 22:31:44 -0700
Subject: [PATCH] DLP dependency update, fix tests

---
 .travis.yml                                   |  2 +-
 dlp/pom.xml                                   | 19 +------------------
 .../main/java/com/example/dlp/Inspect.java    |  7 ++++---
 3 files changed, 6 insertions(+), 22 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 128e302fb89..e8082e9be43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -44,7 +44,7 @@ before_install:
   && set +x && source secrets.env && set -x
   || true
 # Cross project - GOOGLE_APPLICATION_CREDENTIALS uses cloud-docs-tests, but BQ uses G_C_P (argh!)
-- export GOOGLE_CLOUD_PROJECT=java-docs-samples-tests
+- export GOOGLE_CLOUD_PROJECT=java-docs-samples-testing
 # Skip the install step, since Maven will download the dependencies we need
 # when the test build runs.
 # http://stackoverflow.com/q/31945809/101923
diff --git a/dlp/pom.xml b/dlp/pom.xml
index 8da2c4313de..634bc070f3d 100644
--- a/dlp/pom.xml
+++ b/dlp/pom.xml
@@ -37,29 +37,12 @@
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 
-  <!-- Temporary workaround for known issue : https://github.com/GoogleCloudPlatform/google-cloud-java/issues/2192 -->
-  <dependencyManagement>
-    <dependencies>
-      <dependency>
-        <groupId>com.google.auth</groupId>
-        <artifactId>google-auth-library-credentials</artifactId>
-        <version>${google.auth.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>com.google.auth</groupId>
-        <artifactId>google-auth-library-oauth2-http</artifactId>
-        <version>${google.auth.version}</version>
-      </dependency>
-    </dependencies>
-  </dependencyManagement>
-  <!--- End of workaround -->
-
   <dependencies>
     <!-- [START dlp_maven] -->
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-dlp</artifactId>
-      <version>0.20.3-alpha</version>
+      <version>0.21.0-alpha</version>
     </dependency>
     <!-- [END dlp_maven] -->
     <dependency>
diff --git a/dlp/src/main/java/com/example/dlp/Inspect.java b/dlp/src/main/java/com/example/dlp/Inspect.java
index 4b8750f3e76..dc010493dac 100644
--- a/dlp/src/main/java/com/example/dlp/Inspect.java
+++ b/dlp/src/main/java/com/example/dlp/Inspect.java
@@ -15,9 +15,10 @@
 
 package com.example.dlp;
 
-import com.google.api.gax.grpc.OperationFuture;
+import com.google.api.gax.rpc.OperationFuture;
 import com.google.cloud.ServiceOptions;
 import com.google.cloud.dlp.v2beta1.DlpServiceClient;
+import com.google.longrunning.Operation;
 import com.google.privacy.dlp.v2beta1.CloudStorageOptions;
 import com.google.privacy.dlp.v2beta1.CloudStorageOptions.FileSet;
 import com.google.privacy.dlp.v2beta1.ContentItem;
@@ -226,7 +227,7 @@ private static void inspectGcsFile(String bucketName, String fileName,
       OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
 
       // asynchronously submit an inspect operation
-      OperationFuture<InspectOperationResult, InspectOperationMetadata> responseFuture =
+      OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation> responseFuture =
           dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig);
 
       // ...
@@ -291,7 +292,7 @@ private static void inspectDatastore(String projectId, String namespaceId, Strin
       OutputStorageConfig outputConfig = OutputStorageConfig.getDefaultInstance();
 
       // asynchronously submit an inspect operation
-      OperationFuture<InspectOperationResult, InspectOperationMetadata> responseFuture =
+      OperationFuture<InspectOperationResult, InspectOperationMetadata, Operation> responseFuture =
           dlpServiceClient.createInspectOperationAsync(inspectConfig, storageConfig, outputConfig);
 
       // ...