Update of Flexible folder and the top-level parent pom.

flexible/README.md

@@ -1,5 +1,8 @@
 # Google App Engine Flexible Environment Java Samples
 
+<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=flexible/README.md">
+<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
+
 This is a repository that contains Java code samples for [Google App Engine
 flexible environment][aeflex-docs].
 

flexible/analytics/pom.xml

@@ -20,17 +20,22 @@
   <groupId>com.example.flexible</groupId>
   <artifactId>flexible-analytics</artifactId>
 
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
   <parent>
-    <artifactId>appengine-flexible</artifactId>
-    <groupId>com.google.cloud</groupId>
-    <version>1.0.0</version>
-    <relativePath>..</relativePath>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.8</version>
   </parent>
 
   <properties>
+    <maven.compiler.target>1.8</maven.compiler.target>
+    <maven.compiler.source>1.8</maven.compiler.source>
+
     <appengine.maven.plugin>1.3.2</appengine.maven.plugin>
     <jetty>9.4.4.v20170414</jetty>
-
     <failOnMissingWebXml>false</failOnMissingWebXml> <!-- REQUIRED -->
   </properties>
 

flexible/analytics/src/main/java/com/example/analytics/AnalyticsServlet.java

@@ -1,16 +1,19 @@
 /*
  * Copyright 2015 Google Inc.
  *
- * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of the License at
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
  *
- * <p>http://www.apache.org/licenses/LICENSE-2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
  *
- * <p>Unless required by applicable law or agreed to in writing, software distributed under the
- * License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
- * express or implied. See the License for the specific language governing permissions and
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package com.example.analytics;
 
 import java.io.IOException;

flexible/async-rest/README.md

@@ -1,6 +1,10 @@
 
 # Example Web App Using Asynchronous Servlets #
 
+<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=flexible/async-rest/README.md">
+<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
+
+
 This web app demonstrates using asynchronous servlet techniques to reduce server resources.
 
 The code for this tutorial is [here](https://github.com/GoogleCloudPlatform/java-docs-samples/tree/master/flexible/async-rest).

flexible/async-rest/pom.xml

@@ -21,11 +21,14 @@
   <version>1.0.0-SNAPSHOT</version>
   <packaging>war</packaging>
 
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
   <parent>
-    <artifactId>appengine-flexible</artifactId>
-    <groupId>com.google.cloud</groupId>
-    <version>1.0.0</version>
-    <relativePath>..</relativePath>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.8</version>
   </parent>
 
   <properties>

flexible/async-rest/src/main/java/com/google/appengine/demos/DumpServlet.java

@@ -19,7 +19,6 @@
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Collections;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AbstractRestServlet.java

@@ -23,7 +23,6 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Queue;
-
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.UnavailableException;

flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/AsyncRestServlet.java

@@ -16,28 +16,26 @@
 
 package com.google.appengine.demos.asyncrest;
 
-import org.eclipse.jetty.client.HttpClient;
-import org.eclipse.jetty.client.api.Response;
-import org.eclipse.jetty.client.api.Result;
-import org.eclipse.jetty.http.HttpMethod;
-import org.eclipse.jetty.util.BufferUtil;
-import org.eclipse.jetty.util.Utf8StringBuilder;
-import org.eclipse.jetty.util.ajax.JSON;
-import org.eclipse.jetty.util.ssl.SslContextFactory;
-
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.nio.ByteBuffer;
 import java.util.Map;
 import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 import java.util.concurrent.atomic.AtomicInteger;
-
 import javax.servlet.AsyncContext;
 import javax.servlet.ServletConfig;
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.client.HttpClient;
+import org.eclipse.jetty.client.api.Response;
+import org.eclipse.jetty.client.api.Result;
+import org.eclipse.jetty.http.HttpMethod;
+import org.eclipse.jetty.util.BufferUtil;
+import org.eclipse.jetty.util.Utf8StringBuilder;
+import org.eclipse.jetty.util.ajax.JSON;
+import org.eclipse.jetty.util.ssl.SslContextFactory;
 
 /**
  * Servlet which makes REST calls asynchronously.
@@ -134,8 +132,6 @@ void doComplete() {
 
     // We have results!
     // Generate the response
-    String thumbs = generateResults(results);
-
     response.setContentType("text/html");
     PrintWriter out = response.getWriter();
     out.println("<html><head>");
@@ -176,6 +172,8 @@ void doComplete() {
 
     out.println("<br/>");
     out.print("First 5 results of " + results.size() + ":<br/>");
+
+    String thumbs = generateResults(results);
     if ("".equals(thumbs)) {
       out.print("<i>No results. Ensure " + APPKEY + " property is set correctly.</i>");
     } else {

flexible/async-rest/src/main/java/com/google/appengine/demos/asyncrest/SerialRestServlet.java

@@ -16,8 +16,6 @@
 
 package com.google.appengine.demos.asyncrest;
 
-import org.eclipse.jetty.util.ajax.JSON;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -27,10 +25,10 @@
 import java.util.LinkedList;
 import java.util.Map;
 import java.util.Queue;
-
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+import org.eclipse.jetty.util.ajax.JSON;
 
 /**
  * Servlet which makes REST calls serially.
@@ -41,17 +39,21 @@
  * <dd>The Google app key to use</dd>
  * </dl>
  */
+
 public class SerialRestServlet extends AbstractRestServlet {
 
+  //CHECKSTYLE OFF: VariableDeclarationUsageDistance
   @Override
   protected void doGet(HttpServletRequest request, HttpServletResponse response)
       throws ServletException, IOException {
     if (key == null) {
       response.sendError(500, APPKEY + " not set");
       return;
     }
+
     long start = System.nanoTime();
 
+
     String loc = sanitize(request.getParameter(LOC_PARAM));
     String lat = sanitize(request.getParameter(LATITUDE_PARAM));
     String longitude = sanitize(request.getParameter(LONGITUDE_PARAM));
@@ -118,6 +120,7 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
     out.println("</body></html>");
     out.close();
   }
+  //CHECKSTYLE ON: VariableDeclarationUsageDistance
 
   /**
    * Handle HTTP POST request.
@@ -130,4 +133,4 @@ protected void doPost(HttpServletRequest request, HttpServletResponse response)
     doGet(request, response);
   }
 
-}
+}

flexible/cloud-tasks/README.md

@@ -1,5 +1,8 @@
 # Google Cloud Tasks App Engine Flexible Queue Samples
 
+<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=flexible/cloud-tasks/README.md">
+<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
+
 This is a sample AppEngine app demonstrating use of the Cloud Tasks API
 using App Engine Queues.
 

flexible/cloud-tasks/pom.xml

@@ -21,11 +21,14 @@
   <groupId>com.example.cloudtasks</groupId>
   <artifactId>cloudtasks</artifactId>
 
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
   <parent>
-    <artifactId>appengine-flexible</artifactId>
-    <groupId>com.google.cloud</groupId>
-    <version>1.0.0</version>
-    <relativePath>..</relativePath>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.8</version>
   </parent>
 
   <properties>

flexible/cloud-tasks/src/main/java/com/example/cloudtasks/CreateTaskServlet.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2017 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,25 +16,23 @@
 
 package com.example.cloudtasks;
 
+import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
+import com.google.api.client.http.HttpTransport;
+import com.google.api.client.http.javanet.NetHttpTransport;
+import com.google.api.client.json.JsonFactory;
+import com.google.api.client.json.jackson2.JacksonFactory;
+import com.google.api.services.cloudtasks.v2beta2.CloudTasks;
 import com.google.api.services.cloudtasks.v2beta2.CloudTasksScopes;
 import com.google.api.services.cloudtasks.v2beta2.model.AppEngineHttpRequest;
 import com.google.api.services.cloudtasks.v2beta2.model.CreateTaskRequest;
 import com.google.api.services.cloudtasks.v2beta2.model.Task;
-import com.google.appengine.api.utils.SystemProperty;
 import com.google.common.io.BaseEncoding;
 import java.io.IOException;
 import java.io.PrintWriter;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import com.google.api.services.cloudtasks.v2beta2.CloudTasks;
-import com.google.api.client.googleapis.auth.oauth2.GoogleCredential;
-import com.google.api.client.http.HttpTransport;
-import com.google.api.client.http.javanet.NetHttpTransport;
-import com.google.api.client.json.JsonFactory;
-import com.google.api.client.json.jackson2.JacksonFactory;
-
 
 @WebServlet(value = "/create_task")
 @SuppressWarnings("serial")
@@ -44,13 +42,15 @@ public class CreateTaskServlet extends HttpServlet {
   public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
 
     String message = req.getParameter("message");
-    if(message == null) message = "Hello World!";
+    if (message == null) {
+      message = "Hello World!";
+    }
 
     String project = req.getParameter("project");
     String location = req.getParameter("location");
-    String queue_id = req.getParameter("queue");
+    String queueId = req.getParameter("queue");
 
-    createTask(project, location, queue_id, message);
+    createTask(project, location, queueId, message);
 
     PrintWriter out = resp.getWriter();
     out.println(String.format("Created a task with the following message: %s", message));

flexible/cloud-tasks/src/main/java/com/example/cloudtasks/HelloServlet.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2017 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,6 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;

flexible/cloud-tasks/src/main/java/com/example/cloudtasks/TaskHandlerServlet.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2017 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,7 +19,6 @@
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.PrintWriter;
-
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
@@ -34,7 +33,9 @@ public class TaskHandlerServlet extends HttpServlet {
   public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException {
     BufferedReader br = req.getReader();
     StringBuffer dataBuffer = new StringBuffer();
-    while(br.ready()) dataBuffer.append(br.readLine());
+    while (br.ready()) {
+      dataBuffer.append(br.readLine());
+    }
     String data = dataBuffer.toString();
 
     System.out.println(String.format("Received task with payload: %s", data));

flexible/cloudsql/README.md

@@ -1,5 +1,8 @@
 # Cloud SQL sample for Google App Engine Flexible
 
+<a href="https://console.cloud.google.com/cloudshell/open?git_repo=https://github.com/GoogleCloudPlatform/java-docs-samples&page=editor&open_in_editor=flexible/cloudsql/README.md">
+<img alt="Open in Cloud Shell" src ="http://gstatic.com/cloudssh/images/open-btn.png"></a>
+
 This sample demonstrates how to use [Cloud SQL](https://cloud.google.com/cloudsql/) on Google App
 Engine Flexible
 

flexible/cloudsql/pom.xml

@@ -20,11 +20,14 @@
   <groupId>com.example.flexible</groupId>
   <artifactId>flexible-cloudsql</artifactId>
 
+  <!--
+    The parent pom defines common style checks and testing strategies for our samples.
+    Removing or replacing it should not affect the execution of the samples in anyway.
+  -->
   <parent>
-    <artifactId>appengine-flexible</artifactId>
-    <groupId>com.google.cloud</groupId>
-    <version>1.0.0</version>
-    <relativePath>..</relativePath>
+    <groupId>com.google.cloud.samples</groupId>
+    <artifactId>shared-configuration</artifactId>
+    <version>1.0.8</version>
   </parent>
 
 <!-- [START properties] -->

flexible/cloudsql/src/main/java/com/example/cloudsql/CloudSqlServlet.java

@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");

flexible/cloudsql/src/main/resources/config.properties

@@ -1 +1,15 @@
+# Copyright 2015 Google Inc.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 sqlUrl=${sqlURL}