From c02c3d30a937691dcaa9a0c072566514dad5cddd Mon Sep 17 00:00:00 2001 From: DPE bot Date: Tue, 16 Jan 2018 09:50:50 -0800 Subject: [PATCH 1/3] Auto-update dependencies. --- appengine-java8/cloudsql-postgres/pom.xml | 2 +- appengine/cloudsql/pom.xml | 2 +- cloud-tasks/pom.xml | 4 ++-- compute/cmdline/pom.xml | 2 +- flexible/cloud-tasks/pom.xml | 2 +- flexible/cloudsql/pom.xml | 2 +- flexible/postgres/pom.xml | 2 +- iap/pom.xml | 2 +- logging/jul/pom.xml | 4 ++-- logging/logback/pom.xml | 4 ++-- storage/json-api/pom.xml | 2 +- storage/storage-transfer/pom.xml | 2 +- storage/xml-api/cmdline-sample/pom.xml | 2 +- 13 files changed, 16 insertions(+), 16 deletions(-) diff --git a/appengine-java8/cloudsql-postgres/pom.xml b/appengine-java8/cloudsql-postgres/pom.xml index b9a0eaea38a..60c30ab936c 100644 --- a/appengine-java8/cloudsql-postgres/pom.xml +++ b/appengine-java8/cloudsql-postgres/pom.xml @@ -78,7 +78,7 @@ com.google.cloud.sql postgres-socket-factory - 1.0.4 + 1.0.5 diff --git a/appengine/cloudsql/pom.xml b/appengine/cloudsql/pom.xml index d3ac13fef6b..6ffc0c91564 100644 --- a/appengine/cloudsql/pom.xml +++ b/appengine/cloudsql/pom.xml @@ -80,7 +80,7 @@ com.google.cloud.sql mysql-socket-factory - 1.0.4 + 1.0.5 diff --git a/cloud-tasks/pom.xml b/cloud-tasks/pom.xml index 9bc79f05a77..e48e850cdf5 100644 --- a/cloud-tasks/pom.xml +++ b/cloud-tasks/pom.xml @@ -39,7 +39,7 @@ com.google.apis google-api-services-cloudtasks - v2beta2-rev16-1.23.0 + v2beta2-rev31-1.23.0 com.google.api-client @@ -68,7 +68,7 @@ com.google.truth truth - 0.36 + 0.39 test diff --git a/compute/cmdline/pom.xml b/compute/cmdline/pom.xml index 6f10ca40fe5..8c592c22d87 100644 --- a/compute/cmdline/pom.xml +++ b/compute/cmdline/pom.xml @@ -32,7 +32,7 @@ limitations under the License. 1.8 1.8 - v1-rev165-1.23.0 + v1-rev166-1.23.0 UTF-8 diff --git a/flexible/cloud-tasks/pom.xml b/flexible/cloud-tasks/pom.xml index 56e4ceefb66..396bfab405f 100644 --- a/flexible/cloud-tasks/pom.xml +++ b/flexible/cloud-tasks/pom.xml @@ -43,7 +43,7 @@ com.google.apis google-api-services-cloudtasks - v2beta2-rev30-1.23.0 + v2beta2-rev31-1.23.0 com.google.appengine diff --git a/flexible/cloudsql/pom.xml b/flexible/cloudsql/pom.xml index d3bb61ef7f9..258126aa34b 100644 --- a/flexible/cloudsql/pom.xml +++ b/flexible/cloudsql/pom.xml @@ -81,7 +81,7 @@ com.google.cloud.sql mysql-socket-factory-connector-j-6 - 1.0.4 + 1.0.5 diff --git a/flexible/postgres/pom.xml b/flexible/postgres/pom.xml index cce8a01d129..ad655f1d2c5 100644 --- a/flexible/postgres/pom.xml +++ b/flexible/postgres/pom.xml @@ -82,7 +82,7 @@ com.google.cloud.sql postgres-socket-factory - 1.0.4 + 1.0.5 diff --git a/iap/pom.xml b/iap/pom.xml index 007b78f9cbd..d68c6b37e33 100644 --- a/iap/pom.xml +++ b/iap/pom.xml @@ -63,7 +63,7 @@ com.nimbusds nimbus-jose-jwt - 5.3 + 5.4 diff --git a/logging/jul/pom.xml b/logging/jul/pom.xml index 8c480cbad3f..d51a986d539 100644 --- a/logging/jul/pom.xml +++ b/logging/jul/pom.xml @@ -39,7 +39,7 @@ com.google.cloud google-cloud-logging - 1.4.0 + 1.14.0 @@ -52,7 +52,7 @@ com.google.truth truth - 0.34 + 0.39 test diff --git a/logging/logback/pom.xml b/logging/logback/pom.xml index ebd115e87a5..5fa9428f52e 100644 --- a/logging/logback/pom.xml +++ b/logging/logback/pom.xml @@ -39,7 +39,7 @@ com.google.cloud google-cloud-logging-logback - 0.22.0-alpha + 0.32.0-alpha @@ -52,7 +52,7 @@ com.google.truth truth - 0.34 + 0.39 test diff --git a/storage/json-api/pom.xml b/storage/json-api/pom.xml index af1993372da..4dfa9598924 100644 --- a/storage/json-api/pom.xml +++ b/storage/json-api/pom.xml @@ -38,7 +38,7 @@ com.google.apis google-api-services-storage - v1-rev118-1.23.0 + v1-rev119-1.23.0 com.google.guava diff --git a/storage/storage-transfer/pom.xml b/storage/storage-transfer/pom.xml index b805234af72..fee26800fae 100644 --- a/storage/storage-transfer/pom.xml +++ b/storage/storage-transfer/pom.xml @@ -38,7 +38,7 @@ com.google.apis google-api-services-storagetransfer - v1-rev40-1.23.0 + v1-rev42-1.23.0 com.google.guava diff --git a/storage/xml-api/cmdline-sample/pom.xml b/storage/xml-api/cmdline-sample/pom.xml index 9a126e1c93c..275abacfbc1 100644 --- a/storage/xml-api/cmdline-sample/pom.xml +++ b/storage/xml-api/cmdline-sample/pom.xml @@ -66,7 +66,7 @@ com.google.apis google-api-services-storage - v1-rev118-1.23.0 + v1-rev119-1.23.0 com.google.guava From 92ed1e6eb3a302a7c4470909de9ab159e4f62783 Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> Date: Tue, 16 Jan 2018 13:41:59 -0800 Subject: [PATCH 2/3] Updated pull to lease. --- .../main/java/com.example.cloudtasks/PullQueue.java | 13 +++++++------ .../java/com/example/cloudtasks/PullQueueIT.java | 11 ++++++----- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/cloud-tasks/src/main/java/com.example.cloudtasks/PullQueue.java b/cloud-tasks/src/main/java/com.example.cloudtasks/PullQueue.java index f14115941e4..52e0bf03545 100644 --- a/cloud-tasks/src/main/java/com.example.cloudtasks/PullQueue.java +++ b/cloud-tasks/src/main/java/com.example.cloudtasks/PullQueue.java @@ -25,17 +25,18 @@ import com.google.api.services.cloudtasks.v2beta2.CloudTasksScopes; import com.google.api.services.cloudtasks.v2beta2.model.AcknowledgeTaskRequest; import com.google.api.services.cloudtasks.v2beta2.model.CreateTaskRequest; +import com.google.api.services.cloudtasks.v2beta2.model.LeaseTasksRequest; +import com.google.api.services.cloudtasks.v2beta2.model.LeaseTasksResponse; import com.google.api.services.cloudtasks.v2beta2.model.PullMessage; -import com.google.api.services.cloudtasks.v2beta2.model.PullTasksRequest; -import com.google.api.services.cloudtasks.v2beta2.model.PullTasksResponse; import com.google.api.services.cloudtasks.v2beta2.model.Task; import com.google.common.io.BaseEncoding; -import java.io.IOException; import net.sourceforge.argparse4j.ArgumentParsers; import net.sourceforge.argparse4j.inf.ArgumentParser; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparsers; +import java.io.IOException; + public class PullQueue { @@ -110,15 +111,15 @@ private static Task pullTask( CloudTasks client = createAuthorizedClient(); // Create the PullTasksRequest - PullTasksRequest request = new PullTasksRequest().setMaxTasks(1).setLeaseDuration("600s"); + LeaseTasksRequest request = new LeaseTasksRequest().setMaxTasks(1).setLeaseDuration("600s"); //Execute the request and return the pulled task - PullTasksResponse response = client + LeaseTasksResponse response = client .projects() .locations() .queues() .tasks() - .pull(queueName, request) + .lease(queueName, request) .execute(); return response.getTasks().get(0); } diff --git a/cloud-tasks/src/test/java/com/example/cloudtasks/PullQueueIT.java b/cloud-tasks/src/test/java/com/example/cloudtasks/PullQueueIT.java index ccea8cdd95e..8412e8c6c4f 100644 --- a/cloud-tasks/src/test/java/com/example/cloudtasks/PullQueueIT.java +++ b/cloud-tasks/src/test/java/com/example/cloudtasks/PullQueueIT.java @@ -16,17 +16,18 @@ package com.example.cloudtasks; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + /** * Integration (system) tests for {@link PullQueue}. */ From f1b618ab175c824a4ac2eec556a3274025ea953a Mon Sep 17 00:00:00 2001 From: Kurtis Van Gent <31518063+kurtisvg@users.noreply.github.com> Date: Tue, 16 Jan 2018 17:48:48 -0800 Subject: [PATCH 3/3] Fixed style errors. --- .../main/java/com.example.cloudtasks/PullQueue.java | 3 +-- .../test/java/com/example/cloudtasks/PullQueueIT.java | 11 +++++------ 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/cloud-tasks/src/main/java/com.example.cloudtasks/PullQueue.java b/cloud-tasks/src/main/java/com.example.cloudtasks/PullQueue.java index 52e0bf03545..2f28425b0f6 100644 --- a/cloud-tasks/src/main/java/com.example.cloudtasks/PullQueue.java +++ b/cloud-tasks/src/main/java/com.example.cloudtasks/PullQueue.java @@ -30,13 +30,12 @@ import com.google.api.services.cloudtasks.v2beta2.model.PullMessage; import com.google.api.services.cloudtasks.v2beta2.model.Task; import com.google.common.io.BaseEncoding; +import java.io.IOException; import net.sourceforge.argparse4j.ArgumentParsers; import net.sourceforge.argparse4j.inf.ArgumentParser; import net.sourceforge.argparse4j.inf.Namespace; import net.sourceforge.argparse4j.inf.Subparsers; -import java.io.IOException; - public class PullQueue { diff --git a/cloud-tasks/src/test/java/com/example/cloudtasks/PullQueueIT.java b/cloud-tasks/src/test/java/com/example/cloudtasks/PullQueueIT.java index 8412e8c6c4f..ccea8cdd95e 100644 --- a/cloud-tasks/src/test/java/com/example/cloudtasks/PullQueueIT.java +++ b/cloud-tasks/src/test/java/com/example/cloudtasks/PullQueueIT.java @@ -16,18 +16,17 @@ package com.example.cloudtasks; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.junit.runners.JUnit4; -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; - -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; - /** * Integration (system) tests for {@link PullQueue}. */