Update Cloud tasks samples (#1211)

* update sample

* remove pull queues

* updates for beta

* Change comment

* revert env var name

appengine-java8/tasks/README.md

@@ -21,6 +21,7 @@ App Engine task attempts.
  [Cloud Tasks API](https://console.cloud.google.com/launcher/details/google/cloudtasks.googleapis.com).
  * Download and install the [Cloud SDK](https://cloud.google.com/sdk).
  * Download and install [Maven](http://maven.apache.org/install.html).
+ * Set up [Google Application Credentials](https://cloud.google.com/docs/authentication/getting-started).
 
 ## Creating a queue
 
@@ -37,25 +38,18 @@ version unless configured to do otherwise.
 [Using Maven and the App Engine Plugin](https://cloud.google.com/appengine/docs/flexible/java/using-maven)
 & [Maven Plugin Goals and Parameters](https://cloud.google.com/appengine/docs/flexible/java/maven-reference)
 
-### Running locally
-
-```
-mvn appengine:run
-```
-### Deploying
-
 ```
 mvn appengine:deploy
 ```
 
-## Running the Sample
+## Run the Sample Using the Command Line
 
 Set environment variables:
 
 First, your project ID:
 
 ```
-export GOOGLE_CLOUD_PROJECT=<YOUR_PROJECT_ID>
+export GOOGLE_CLOUD_PROJECT=<YOUR_GOOGLE_CLOUD_PROJECT>
 ```
 
 Then the queue ID, as specified at queue creation time. Queue IDs already
@@ -85,11 +79,7 @@ mvn exec:java -Dexec.mainClass="com.example.task.CreateTask" \
 
 The App Engine app serves as a target for the push requests. It has an
 endpoint `/tasks/create` that reads the payload (i.e., the request body) of the
-HTTP POST request and logs it. The log output can be viewed with:
-
-```
-gcloud app logs read
-```
+HTTP POST request and logs it. The log output can be viewed with [Stackdriver Logging](https://console.cloud.google.com/logs/viewer?minLogLevel=0).
 
 Create a task that will be scheduled for a time in the future using the
 `--in-seconds` flag:

appengine-java8/tasks/pom.xml

@@ -37,6 +37,7 @@ Copyright 2018 Google LLC
   <properties>
     <maven.compiler.target>1.8</maven.compiler.target>
     <maven.compiler.source>1.8</maven.compiler.source>
+    <failOnMissingWebXml>false</failOnMissingWebXml>
   </properties>
 
   <dependencies>
@@ -51,7 +52,7 @@ Copyright 2018 Google LLC
     <dependency>
       <groupId>com.google.cloud</groupId>
       <artifactId>google-cloud-tasks</artifactId>
-      <version>0.54.0-beta</version>
+      <version>0.61.0-beta</version>
     </dependency>
     <dependency>
       <groupId>commons-cli</groupId>
@@ -69,7 +70,7 @@ Copyright 2018 Google LLC
       <plugin>
         <groupId>com.google.cloud.tools</groupId>
         <artifactId>appengine-maven-plugin</artifactId>
-        <version>1.3.1</version>
+        <version>1.3.2</version>
         <configuration>
           <deploy.promote>true</deploy.promote>
           <deploy.stopPreviousVersion>true</deploy.stopPreviousVersion>

appengine-java8/tasks/src/main/java/com/example/task/CreateTask.java

@@ -16,11 +16,11 @@
 
 package com.example.task;
 
-import com.google.cloud.tasks.v2beta2.AppEngineHttpRequest;
-import com.google.cloud.tasks.v2beta2.CloudTasksClient;
-import com.google.cloud.tasks.v2beta2.HttpMethod;
-import com.google.cloud.tasks.v2beta2.QueueName;
-import com.google.cloud.tasks.v2beta2.Task;
+import com.google.cloud.tasks.v2beta3.AppEngineHttpRequest;
+import com.google.cloud.tasks.v2beta3.CloudTasksClient;
+import com.google.cloud.tasks.v2beta3.HttpMethod;
+import com.google.cloud.tasks.v2beta3.QueueName;
+import com.google.cloud.tasks.v2beta3.Task;
 import com.google.common.base.Strings;
 import com.google.protobuf.ByteString;
 import com.google.protobuf.Timestamp;
@@ -38,7 +38,7 @@
 import org.apache.commons.cli.ParseException;
 
 public class CreateTask {
-  private static String GGOGLE_CLOUD_PROJECT_KEY = "GOOGLE_CLOUD_PROJECT";
+  private static String GOOGLE_CLOUD_PROJECT_KEY = "GOOGLE_CLOUD_PROJECT";
 
   private static Option PROJECT_ID_OPTION = Option.builder("pid")
       .longOpt("project-id")
@@ -109,7 +109,7 @@ public static void main(String... args) throws Exception {
     if (params.hasOption("project-id")) {
       projectId = params.getOptionValue("project-id");
     } else {
-      projectId = System.getenv(GGOGLE_CLOUD_PROJECT_KEY);
+      projectId = System.getenv(GOOGLE_CLOUD_PROJECT_KEY);
     }
     if (Strings.isNullOrEmpty(projectId)) {
       printUsage(options);
@@ -121,22 +121,37 @@ public static void main(String... args) throws Exception {
     String payload = params.getOptionValue(PAYLOAD_OPTION.getOpt(), "default payload");
 
     // [START cloud_tasks_appengine_create_task]
+    // Instantiates a client.
     try (CloudTasksClient client = CloudTasksClient.create()) {
+
+      // Variables provided by the CLI.
+      // projectId = "my-project-id";
+      // queueName = "my-appengine-queue";
+      // location = "us-central1";
+      // payload = "hello";
+
+      // Construct the fully qualified queue name.
+      String queuePath = QueueName.of(projectId, location, queueName).toString();
+
+      // Construct the task body.
       Task.Builder taskBuilder = Task
           .newBuilder()
           .setAppEngineHttpRequest(AppEngineHttpRequest.newBuilder()
-              .setPayload(ByteString.copyFrom(payload, Charset.defaultCharset()))
-              .setRelativeUrl("/tasks/create")
+              .setBody(ByteString.copyFrom(payload, Charset.defaultCharset()))
+              .setRelativeUri("/tasks/create")
               .setHttpMethod(HttpMethod.POST)
               .build());
+
       if (params.hasOption(IN_SECONDS_OPTION.getOpt())) {
+        // Add the scheduled time to the request.
         int seconds = Integer.parseInt(params.getOptionValue(IN_SECONDS_OPTION.getOpt()));
         taskBuilder.setScheduleTime(Timestamp
             .newBuilder()
             .setSeconds(Instant.now(Clock.systemUTC()).plusSeconds(seconds).getEpochSecond()));
       }
-      Task task = client.createTask(
-          QueueName.of(projectId, location, queueName).toString(), taskBuilder.build());
+
+      // Send create task request.
+      Task task = client.createTask(queuePath, taskBuilder.build());
       System.out.println("Task created: " + task.getName());
     }
     // [END cloud_tasks_appengine_create_task]

appengine-java8/tasks/src/main/java/com/example/task/TaskServlet.java

@@ -35,10 +35,13 @@ public class TaskServlet extends HttpServlet {
   @Override
   public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
     log.info("Received task request: " + req.getServletPath());
-    if (req.getParameter("payload") != null) {
-      String payload = req.getParameter("payload");
-      log.info("Request payload: " + payload);
-      String output = String.format("Received task with payload %s", payload);
+    String body = req.getReader()
+        .lines()
+        .reduce("", (accumulator, actual) -> accumulator + actual);
+
+    if (!body.isEmpty()) {
+      log.info("Request payload: " + body);
+      String output = String.format("Received task with payload %s", body);
       resp.getOutputStream().write(output.getBytes());
       log.info("Sending response: " + output);
       resp.setStatus(HttpServletResponse.SC_OK);