Fixed style and README.md.

Annie29 · Annie29 · commit f5c1b4d902ce · 2016-04-19T09:43:49.000-07:00
diff --git a/appengine/users/README.md b/appengine/users/README.md
@@ -11,23 +11,27 @@ This example uses the
 [Maven gcloud plugin](https://cloud.google.com/appengine/docs/java/managed-vms/maven).
 To run this sample locally:
 
-    $ mvn gcloud:run
+    $ mvn appengine:devserver
 
 ## Deploying
 In the following command, replace YOUR-PROJECT-ID with your
 [Google Cloud Project ID](https://developers.google.com/console/help/new/#projectnumber).
 
-    $ mvn gcloud:deploy -Dgcloud.gcloud_project=YOUR-PROJECT-ID
+    $ mvn appengine:update -Dappengine.appId=YOUR-PROJECT-ID -Dappengine.version=SOME-VERSION
 
 ## Setup
 To save your project settings so that you don't need to enter the
-`-Dgcloud.gcloud_project=YOUR-CLOUD-PROJECT-ID` parameters, you can:
+ parameters, you can:
 
 1. Update the <application> tag in src/main/webapp/WEB-INF/appengine-web.xml
    with your project name.
 
+2. Update the <version> tag in src/main/webapp/WEB-INF/appengine-web.xml
+   with a valid version number.
+
+
 You will now be able to run
 
-    $ mvn gcloud:deploy
+    $ mvn appengine:update
 
 without the need for any additional parameters.
diff --git a/appengine/users/pom.xml b/appengine/users/pom.xml
@@ -30,11 +30,11 @@ Copyright 2015 Google Inc. All Rights Reserved.
   </parent>
   <dependencies>
    <dependency>
-      <groupId>com.google.appengine</groupId>
-      <artifactId>appengine-api-1.0-sdk</artifactId>
-      <version>${appengine.sdk.version}</version>
-    </dependency>
-    <dependency>
+    <groupId>com.google.appengine</groupId>
+    <artifactId>appengine-maven-plugin</artifactId>
+    <version>${appengine.sdk.version}</version>
+   </dependency>
+   <dependency>
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
       <version>19.0</version>
diff --git a/appengine/users/src/main/java/com/example/appengine/users/UsersServlet.java b/appengine/users/src/main/java/com/example/appengine/users/UsersServlet.java
@@ -12,37 +12,40 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 // [START users_API_example]
 package com.example.appengine.users;
 
+import com.google.appengine.api.users.UserService;
+import com.google.appengine.api.users.UserServiceFactory;
+
 import java.io.IOException;
+
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import com.google.appengine.api.users.UserService;
-import com.google.appengine.api.users.UserServiceFactory;
 
 public class UsersServlet extends HttpServlet {
-    @Override
-    public void doGet(HttpServletRequest req, HttpServletResponse resp)
-            throws IOException {
-        UserService userService = UserServiceFactory.getUserService();
-
-        String thisURL = req.getRequestURI();
-
-        resp.setContentType("text/html");
-	if (req.getUserPrincipal() != null) {
-            resp.getWriter().println("<p>Hello, " +
-                                     req.getUserPrincipal().getName() +
-                                     "!  You can <a href=\"" +
-                                     userService.createLogoutURL(thisURL) +
-                                     "\">sign out</a>.</p>");
-        } else {
-            resp.getWriter().println("<p>Please <a href=\"" +
-                                     userService.createLoginURL(thisURL) +
-                                     "\">sign in</a>.</p>");
-        }
+  @Override
+  public void doGet(HttpServletRequest req, HttpServletResponse resp)
+        throws IOException {
+    UserService userService = UserServiceFactory.getUserService();
+
+    String thisUrl = req.getRequestURI();
+
+    resp.setContentType("text/html");
+    if (req.getUserPrincipal() != null) {
+      resp.getWriter().println("<p>Hello, "
+          + req.getUserPrincipal().getName()
+          + "!  You can <a href=\""
+          + userService.createLogoutURL(thisUrl)
+          + "\">sign out</a>.</p>");
+    } else {
+      resp.getWriter().println("<p>Please <a href=\""
+            + userService.createLoginURL(thisUrl)
+            + "\">sign in</a>.</p>");
     }
+  }
 }
 // [END users_API_example]
 
diff --git a/appengine/users/src/main/webapp/WEB-INF/appengine-web.xml b/appengine/users/src/main/webapp/WEB-INF/appengine-web.xml
@@ -3,5 +3,4 @@
   <application>YOUR-PROJECT-ID</application>
   <version>YOUR-VERSION-ID</version>
   <threadsafe>true</threadsafe>
-  <vm>true</vm>
 </appengine-web-app>
diff --git a/appengine/users/src/main/webapp/WEB-INF/web.xml b/appengine/users/src/main/webapp/WEB-INF/web.xml
@@ -5,7 +5,7 @@
   version="2.5">
   <servlet>
     <servlet-name>users</servlet-name>
-    <servlet-class>com.example.appengine.users.MyServlet</servlet-class>
+    <servlet-class>com.example.appengine.users.UsersServlet</servlet-class>
   </servlet>
   <servlet-mapping>
     <servlet-name>users</servlet-name>
diff --git a/appengine/users/src/main/webapp/web.xml b/appengine/users/src/main/webapp/web.xml
diff --git a/appengine/users/src/test/java/com/example/appengine/users/UsersServletTest.java b/appengine/users/src/test/java/com/example/appengine/users/UsersServletTest.java
@@ -32,17 +32,17 @@
 import java.io.PrintWriter;
 import java.io.StringWriter;
 
+import javax.management.remote.JMXPrincipal;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.management.remote.JMXPrincipal;
 
 /**
  * Unit tests for {@link UsersServlet}.
  */
 @RunWith(JUnit4.class)
 public class UsersServletTest {
-   private final String fakeURL = "fakey.fake.fak"; 
-   private final String FAKE_NAME = "Fake"; 
+  private static final String FAKE_URL = "fakey.fake.fak"; 
+  private static final String FAKE_NAME = "Fake"; 
   // Set up a helper so that the ApiProxy returns a valid environment for local testing.
   private final LocalServiceTestHelper helper = new LocalServiceTestHelper();
 
@@ -59,14 +59,14 @@ public void setUp() throws Exception {
 
     //  Set up some fake HTTP requests
     //  If the user isn't logged in, use this request
-    when (mockRequestNotLoggedIn.getRequestURI()).thenReturn(fakeURL);
-    when (mockRequestNotLoggedIn.getUserPrincipal()).thenReturn(null);
+    when(mockRequestNotLoggedIn.getRequestURI()).thenReturn(FAKE_URL);
+    when(mockRequestNotLoggedIn.getUserPrincipal()).thenReturn(null);
 
     //  If the user is logged in, use this request
-    when (mockRequestLoggedIn.getRequestURI()).thenReturn(fakeURL);
+    when(mockRequestLoggedIn.getRequestURI()).thenReturn(FAKE_URL);
     //  Most of the classes that implement Principal have been
     //  deprecated.  JMXPrincipal seems like a safe choice. 
-    when (mockRequestLoggedIn.getUserPrincipal()).thenReturn(new JMXPrincipal(FAKE_NAME));
+    when(mockRequestLoggedIn.getUserPrincipal()).thenReturn(new JMXPrincipal(FAKE_NAME));
 
     // Set up a fake HTTP response.
     responseWriter = new StringWriter();
@@ -92,7 +92,8 @@ public void doGet_userNotLoggedIn_writesResponse() throws Exception {
         .named("UsersServlet response")
         .contains("sign in</a>.</p>"); 
   }
- @Test
+
+  @Test
   public void doGet_userLoggedIn_writesResponse() throws Exception {
     servletUnderTest.doGet(mockRequestLoggedIn, mockResponse);
 
