diff --git a/appengine-java8/datastore-indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java b/appengine-java8/datastore-indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java
index b1eae0d9380..a4b72712f49 100644
--- a/appengine-java8/datastore-indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java
+++ b/appengine-java8/datastore-indexes-exploding/src/test/java/com/example/appengine/IndexesServletTest.java
@@ -86,7 +86,7 @@ public void doGet_emptyDatastore_writesNoWidgets() throws Exception {
         .isEqualTo("Got 0 widgets.\n");
   }
 
-  @SuppressWarnings(VariableDeclarationUsageDistance)
+  @SuppressWarnings("VariableDeclarationUsageDistance")
   @Test
   public void doGet_repeatedPropertyEntities_writesWidgets() throws Exception {
     DatastoreService datastore = DatastoreServiceFactory.getDatastoreService();
diff --git a/appengine-java8/firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java b/appengine-java8/firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
index 5934f9f6de3..e4a203af34d 100644
--- a/appengine-java8/firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
+++ b/appengine-java8/firebase-event-proxy/src/main/java/com/example/GaeFirebaseEventProxy/FirebaseEventProxy.java
@@ -66,7 +66,7 @@ public FirebaseEventProxy() {
   /**
    * start the proxy.
    */
-  @SuppressWarnings(VariableDeclarationUsageDistance)
+  @SuppressWarnings("VariableDeclarationUsageDistance")
   public void start() {
     DatabaseReference firebase = FirebaseDatabase.getInstance().getReference();
 
diff --git a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java
index 1165a793d23..0bf17f3ac99 100644
--- a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java
+++ b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Greeting.java
@@ -28,7 +28,7 @@
 import java.util.Date;
 import java.util.Objects;
 
-@SuppressWarnings(JavadocMethod)
+@SuppressWarnings("JavadocMethod")
 public class Greeting {
 
   private Guestbook book;
diff --git a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java
index a827b998c12..43b768daf3b 100644
--- a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java
+++ b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Guestbook.java
@@ -32,7 +32,7 @@
 import java.util.Objects;
 
 //[START all]
-@SuppressWarnings(JavadocMethod)
+@SuppressWarnings("JavadocMethod")
 public class Guestbook {
 
   private static final KeyFactory keyFactory = getKeyFactory(Guestbook.class);
diff --git a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java
index e144e113279..92bc8af9766 100644
--- a/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java
+++ b/appengine-java8/guestbook-cloud-datastore/src/main/java/com/example/guestbook/Persistence.java
@@ -24,7 +24,7 @@ public class Persistence {
 
   private static AtomicReference<Datastore> datastore = new AtomicReference<>();
 
-  @SuppressWarnings(JavadocMethod)
+  @SuppressWarnings("JavadocMethod")
   public static Datastore getDatastore() {
     if (datastore.get() == null) {
       datastore.set(
diff --git a/appengine-java8/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java b/appengine-java8/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java
index 34a6a7d283b..7e1c907d479 100644
--- a/appengine-java8/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java
+++ b/appengine-java8/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java
@@ -51,7 +51,7 @@ public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOEx
   }
 
   // [START simple]
-  @SuppressWarnings(VariableDeclarationUsageDistance)
+  @SuppressWarnings("VariableDeclarationUsageDistance")
   private ClientResponse sendSimpleMessage(String recipient) {
     Client client = Client.create();
     client.addFilter(new HTTPBasicAuthFilter("api", MAILGUN_API_KEY));
@@ -69,7 +69,7 @@ private ClientResponse sendSimpleMessage(String recipient) {
   // [END simple]
 
   // [START complex]
-  @SuppressWarnings(VariableDeclarationUsageDistance)
+  @SuppressWarnings("VariableDeclarationUsageDistance")
   private ClientResponse sendComplexMessage(String recipient) {
     Client client = Client.create();
     client.addFilter(new HTTPBasicAuthFilter("api", MAILGUN_API_KEY));
diff --git a/appengine-java8/metadata/src/main/java/com/example/appengine/standard/MetadataServlet.java b/appengine-java8/metadata/src/main/java/com/example/appengine/standard/MetadataServlet.java
index a46d6c4a845..ae6c2c982d3 100644
--- a/appengine-java8/metadata/src/main/java/com/example/appengine/standard/MetadataServlet.java
+++ b/appengine-java8/metadata/src/main/java/com/example/appengine/standard/MetadataServlet.java
@@ -33,7 +33,7 @@
 
 
 // [START example]
-@SuppressWarnings({"serial"})
+@SuppressWarnings("serial")
 // With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
 @WebServlet(name = "Metadata", description = "Metadata: Write info about GAE Standard",
     urlPatterns = "/metadata")