From 0b5f82c29c7fc5555558aa4ba1a5142423fb7d7a Mon Sep 17 00:00:00 2001
From: Averi Kitsch <akitsch@google.com>
Date: Wed, 13 Nov 2019 10:28:43 -0800
Subject: [PATCH] samples: Update Cloud Tasks library version (#1719)

* Update to new library

* Update pom.xml

* Update to new library

* Update pom.xml

* Add queue purge to tests

* catch exception
---
 .../main/java/com/example/task/CreateHttpTask.java   | 10 +++++-----
 .../com/example/task/CreateHttpTaskWithToken.java    | 12 ++++++------
 .../test/java/com/example/task/CreateHttpTaskIT.java | 10 ++++++++--
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/tasks/snippets/src/main/java/com/example/task/CreateHttpTask.java b/tasks/snippets/src/main/java/com/example/task/CreateHttpTask.java
index 6e1e6b2ee4d..858b439ae58 100644
--- a/tasks/snippets/src/main/java/com/example/task/CreateHttpTask.java
+++ b/tasks/snippets/src/main/java/com/example/task/CreateHttpTask.java
@@ -17,11 +17,11 @@
 package com.example.task;
 
 // [START cloud_tasks_create_http_task]
-import com.google.cloud.tasks.v2beta3.CloudTasksClient;
-import com.google.cloud.tasks.v2beta3.HttpMethod;
-import com.google.cloud.tasks.v2beta3.HttpRequest;
-import com.google.cloud.tasks.v2beta3.QueueName;
-import com.google.cloud.tasks.v2beta3.Task;
+import com.google.cloud.tasks.v2.CloudTasksClient;
+import com.google.cloud.tasks.v2.HttpMethod;
+import com.google.cloud.tasks.v2.HttpRequest;
+import com.google.cloud.tasks.v2.QueueName;
+import com.google.cloud.tasks.v2.Task;
 import com.google.protobuf.ByteString;
 import java.nio.charset.Charset;
 
diff --git a/tasks/snippets/src/main/java/com/example/task/CreateHttpTaskWithToken.java b/tasks/snippets/src/main/java/com/example/task/CreateHttpTaskWithToken.java
index 9259243bd97..72c4768ef35 100644
--- a/tasks/snippets/src/main/java/com/example/task/CreateHttpTaskWithToken.java
+++ b/tasks/snippets/src/main/java/com/example/task/CreateHttpTaskWithToken.java
@@ -17,12 +17,12 @@
 package com.example.task;
 
 // [START cloud_tasks_create_http_task_with_token]
-import com.google.cloud.tasks.v2beta3.CloudTasksClient;
-import com.google.cloud.tasks.v2beta3.HttpMethod;
-import com.google.cloud.tasks.v2beta3.HttpRequest;
-import com.google.cloud.tasks.v2beta3.OidcToken;
-import com.google.cloud.tasks.v2beta3.QueueName;
-import com.google.cloud.tasks.v2beta3.Task;
+import com.google.cloud.tasks.v2.CloudTasksClient;
+import com.google.cloud.tasks.v2.HttpMethod;
+import com.google.cloud.tasks.v2.HttpRequest;
+import com.google.cloud.tasks.v2.OidcToken;
+import com.google.cloud.tasks.v2.QueueName;
+import com.google.cloud.tasks.v2.Task;
 import com.google.protobuf.ByteString;
 import java.nio.charset.Charset;
 
diff --git a/tasks/snippets/src/test/java/com/example/task/CreateHttpTaskIT.java b/tasks/snippets/src/test/java/com/example/task/CreateHttpTaskIT.java
index 02bc66029b4..e03d907a677 100644
--- a/tasks/snippets/src/test/java/com/example/task/CreateHttpTaskIT.java
+++ b/tasks/snippets/src/test/java/com/example/task/CreateHttpTaskIT.java
@@ -18,13 +18,13 @@
 
 import static com.google.common.truth.Truth.assertThat;
 
+import com.google.cloud.tasks.v2.CloudTasksClient;
+import com.google.cloud.tasks.v2.QueueName;
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Rule;
 import org.junit.Test;
-import org.junit.rules.Timeout;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
 
@@ -49,6 +49,12 @@ public void setUp() {
   @After
   public void tearDown() {
     System.setOut(null);
+    try (CloudTasksClient client = CloudTasksClient.create()) {
+      String queuePath = QueueName.of(PROJECT_ID, LOCATION_ID, QUEUE_ID).toString();
+      client.purgeQueue(queuePath);
+    } catch (Exception e) {
+      System.out.println("Error with queue purge.");
+    }
   }
 
   @Test