From e995e333d44e32f2483ff9faa7831b3e335fb75b Mon Sep 17 00:00:00 2001 From: averikitsch Date: Mon, 28 Oct 2019 13:30:20 -0700 Subject: [PATCH 1/6] Update to new library --- .../main/java/com/example/task/CreateHttpTask.java | 10 +++++----- .../com/example/task/CreateHttpTaskWithToken.java | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tasks/src/main/java/com/example/task/CreateHttpTask.java b/tasks/src/main/java/com/example/task/CreateHttpTask.java index 6e1e6b2ee4d..858b439ae58 100644 --- a/tasks/src/main/java/com/example/task/CreateHttpTask.java +++ b/tasks/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/src/main/java/com/example/task/CreateHttpTaskWithToken.java b/tasks/src/main/java/com/example/task/CreateHttpTaskWithToken.java index 9259243bd97..72c4768ef35 100644 --- a/tasks/src/main/java/com/example/task/CreateHttpTaskWithToken.java +++ b/tasks/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; From 631aca471a77984840dbb1c7339e05413796cf76 Mon Sep 17 00:00:00 2001 From: averikitsch Date: Mon, 11 Nov 2019 10:09:56 -0800 Subject: [PATCH 2/6] Update pom.xml --- appengine-java11/tasks/pom.xml | 2 +- appengine-java8/tasks/app/pom.xml | 2 +- appengine-java8/tasks/quickstart/pom.xml | 2 +- appengine-java8/tasks/snippets/pom.xml | 2 +- tasks/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/appengine-java11/tasks/pom.xml b/appengine-java11/tasks/pom.xml index 0992d6f9447..18b7ea1f6b3 100644 --- a/appengine-java11/tasks/pom.xml +++ b/appengine-java11/tasks/pom.xml @@ -45,7 +45,7 @@ Copyright 2019 Google LLC com.google.cloud google-cloud-tasks - 1.10.0 + 1.27.0 diff --git a/appengine-java8/tasks/app/pom.xml b/appengine-java8/tasks/app/pom.xml index 87ddaf4eea0..f0833cb325a 100644 --- a/appengine-java8/tasks/app/pom.xml +++ b/appengine-java8/tasks/app/pom.xml @@ -50,7 +50,7 @@ Copyright 2019 Google LLC com.google.cloud google-cloud-tasks - 1.3.0 + 1.27.0 diff --git a/appengine-java8/tasks/quickstart/pom.xml b/appengine-java8/tasks/quickstart/pom.xml index 2e6ecdf2ae8..7372221b4e4 100644 --- a/appengine-java8/tasks/quickstart/pom.xml +++ b/appengine-java8/tasks/quickstart/pom.xml @@ -52,7 +52,7 @@ Copyright 2018 Google LLC com.google.cloud google-cloud-tasks - 1.10.0 + 1.27.0 commons-cli diff --git a/appengine-java8/tasks/snippets/pom.xml b/appengine-java8/tasks/snippets/pom.xml index 11860b702d7..e392d2cfee6 100644 --- a/appengine-java8/tasks/snippets/pom.xml +++ b/appengine-java8/tasks/snippets/pom.xml @@ -44,7 +44,7 @@ Copyright 2019 Google LLC com.google.cloud google-cloud-tasks - 1.3.0 + 1.27.0 com.google.protobuf diff --git a/tasks/pom.xml b/tasks/pom.xml index ffd884da8f0..bfe6e877faf 100644 --- a/tasks/pom.xml +++ b/tasks/pom.xml @@ -44,7 +44,7 @@ Copyright 2018 Google LLC com.google.cloud google-cloud-tasks - 1.10.0 + 1.27.0 com.google.protobuf From 6060d2f5e5fef9590dfff23a51d63edeef70d2fd Mon Sep 17 00:00:00 2001 From: averikitsch Date: Mon, 28 Oct 2019 13:30:20 -0700 Subject: [PATCH 3/6] Update to new library --- .../main/java/com/example/task/CreateHttpTask.java | 10 +++++----- .../com/example/task/CreateHttpTaskWithToken.java | 12 ++++++------ 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tasks/src/main/java/com/example/task/CreateHttpTask.java b/tasks/src/main/java/com/example/task/CreateHttpTask.java index 6e1e6b2ee4d..858b439ae58 100644 --- a/tasks/src/main/java/com/example/task/CreateHttpTask.java +++ b/tasks/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/src/main/java/com/example/task/CreateHttpTaskWithToken.java b/tasks/src/main/java/com/example/task/CreateHttpTaskWithToken.java index 9259243bd97..72c4768ef35 100644 --- a/tasks/src/main/java/com/example/task/CreateHttpTaskWithToken.java +++ b/tasks/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; From 24f668289831751c0eeac6346dd4dad9733b2348 Mon Sep 17 00:00:00 2001 From: averikitsch Date: Mon, 11 Nov 2019 10:09:56 -0800 Subject: [PATCH 4/6] Update pom.xml --- appengine-java11/tasks/pom.xml | 2 +- appengine-java8/tasks/app/pom.xml | 2 +- appengine-java8/tasks/quickstart/pom.xml | 2 +- appengine-java8/tasks/snippets/pom.xml | 2 +- tasks/pom.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/appengine-java11/tasks/pom.xml b/appengine-java11/tasks/pom.xml index e5a52b0a144..18b7ea1f6b3 100644 --- a/appengine-java11/tasks/pom.xml +++ b/appengine-java11/tasks/pom.xml @@ -45,7 +45,7 @@ Copyright 2019 Google LLC com.google.cloud google-cloud-tasks - 1.26.0 + 1.27.0 diff --git a/appengine-java8/tasks/app/pom.xml b/appengine-java8/tasks/app/pom.xml index 7b113b92813..387e9905a0a 100644 --- a/appengine-java8/tasks/app/pom.xml +++ b/appengine-java8/tasks/app/pom.xml @@ -50,7 +50,7 @@ Copyright 2019 Google LLC com.google.cloud google-cloud-tasks - 1.26.0 + 1.27.0 diff --git a/appengine-java8/tasks/quickstart/pom.xml b/appengine-java8/tasks/quickstart/pom.xml index d10462afa59..3060aefe8d1 100644 --- a/appengine-java8/tasks/quickstart/pom.xml +++ b/appengine-java8/tasks/quickstart/pom.xml @@ -52,7 +52,7 @@ Copyright 2018 Google LLC com.google.cloud google-cloud-tasks - 1.26.0 + 1.27.0 commons-cli diff --git a/appengine-java8/tasks/snippets/pom.xml b/appengine-java8/tasks/snippets/pom.xml index 747f0b54ec4..e392d2cfee6 100644 --- a/appengine-java8/tasks/snippets/pom.xml +++ b/appengine-java8/tasks/snippets/pom.xml @@ -44,7 +44,7 @@ Copyright 2019 Google LLC com.google.cloud google-cloud-tasks - 1.26.0 + 1.27.0 com.google.protobuf diff --git a/tasks/pom.xml b/tasks/pom.xml index d93e73ce159..bfe6e877faf 100644 --- a/tasks/pom.xml +++ b/tasks/pom.xml @@ -44,7 +44,7 @@ Copyright 2018 Google LLC com.google.cloud google-cloud-tasks - 1.26.0 + 1.27.0 com.google.protobuf From eaaf804b510ddd7529f05d88db8f1227b1f7dfe8 Mon Sep 17 00:00:00 2001 From: averikitsch Date: Tue, 12 Nov 2019 09:07:05 -0800 Subject: [PATCH 5/6] Add queue purge to tests --- .../src/test/java/com/example/task/CreateHttpTaskIT.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/tasks/src/test/java/com/example/task/CreateHttpTaskIT.java b/tasks/src/test/java/com/example/task/CreateHttpTaskIT.java index 02bc66029b4..6d3284c9124 100644 --- a/tasks/src/test/java/com/example/task/CreateHttpTaskIT.java +++ b/tasks/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,10 @@ 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); + } } @Test From 5b133139be2f7b73036463b7c6fc2c0ab8ce024d Mon Sep 17 00:00:00 2001 From: averikitsch Date: Tue, 12 Nov 2019 09:16:26 -0800 Subject: [PATCH 6/6] catch exception --- tasks/src/test/java/com/example/task/CreateHttpTaskIT.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tasks/src/test/java/com/example/task/CreateHttpTaskIT.java b/tasks/src/test/java/com/example/task/CreateHttpTaskIT.java index 6d3284c9124..e03d907a677 100644 --- a/tasks/src/test/java/com/example/task/CreateHttpTaskIT.java +++ b/tasks/src/test/java/com/example/task/CreateHttpTaskIT.java @@ -52,6 +52,8 @@ public void tearDown() { 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."); } }