GoogleCloudPlatform · lesv · Aug 23, 2017 · Aug 23, 2017
diff --git a/.editorconfig b/.editorconfig
diff --git a/...ngine-java8/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java b/...ngine-java8/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelper.java b/appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/bigtable/src/test/java/com/example/bigtable/ITBigtableHelloWorld.java b/appengine-java8/bigtable/src/test/java/com/example/bigtable/ITBigtableHelloWorld.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/datastore/src/test/java/com/example/appengine/EntitiesTest.java b/appengine-java8/datastore/src/test/java/com/example/appengine/EntitiesTest.java
@@ -46,12 +46,11 @@
 @RunWith(JUnit4.class)
 public class EntitiesTest {
 
+  // Set no eventual consistency, that way queries return all results.
+  // https://cloud.google.com/appengine/docs/java/tools/localunittesting
+  // #Java_Writing_High_Replication_Datastore_tests
   private final LocalServiceTestHelper helper =
       new LocalServiceTestHelper(
-          // Set no eventual consistency, that way queries return all results.
-          // https://cloud.google
-          // .com/appengine/docs/java/tools/localunittesting
-          // #Java_Writing_High_Replication_Datastore_tests
           new LocalDatastoreServiceTestConfig()
               .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
 

diff --git a/appengine-java8/datastore/src/test/java/com/example/appengine/GuestbookStrongTest.java b/appengine-java8/datastore/src/test/java/com/example/appengine/GuestbookStrongTest.java
@@ -39,12 +39,11 @@ public class GuestbookStrongTest {
   private static final Instant FAKE_NOW = new Instant(1234567890L);
   private static final String GUESTBOOK_ID = "my guestbook";
 
+  // Set maximum eventual consistency.
+  // https://cloud.google.com/appengine/docs/java/tools/localunittesting
+  // #Java_Writing_High_Replication_Datastore_tests
   private final LocalServiceTestHelper helper =
       new LocalServiceTestHelper(
-          // Set maximum eventual consistency.
-          // https://cloud.google
-          // .com/appengine/docs/java/tools/localunittesting
-          // #Java_Writing_High_Replication_Datastore_tests
           new LocalDatastoreServiceTestConfig()
               .setDefaultHighRepJobPolicyUnappliedJobPercentage(100),
           // Make sure there is a user logged in. We enforce this in web.xml.

diff --git a/appengine-java8/datastore/src/test/java/com/example/appengine/GuestbookTest.java b/appengine-java8/datastore/src/test/java/com/example/appengine/GuestbookTest.java
@@ -55,12 +55,11 @@ public boolean shouldRollForwardExistingJob(Key entityGroup) {
     }
   }
 
+  // Set custom, deterministic, eventual consistency.
+  // https://cloud.google.com/appengine/docs/java/tools/localunittesting
+  // #Java_Writing_High_Replication_Datastore_tests
   private final LocalServiceTestHelper helper =
       new LocalServiceTestHelper(
-          // Set custom, deterministic, eventual consistency.
-          // https://cloud.google
-          // .com/appengine/docs/java/tools/localunittesting
-          // #Java_Writing_High_Replication_Datastore_tests
           new LocalDatastoreServiceTestConfig()
               .setAlternateHighRepJobPolicyClass(CustomHighRepJobPolicy.class),
           // Make sure there is a user logged in. We enforce this in web.xml.

diff --git a/appengine-java8/datastore/src/test/java/com/example/appengine/IndexesTest.java b/appengine-java8/datastore/src/test/java/com/example/appengine/IndexesTest.java
@@ -43,12 +43,11 @@
 @RunWith(JUnit4.class)
 public class IndexesTest {
 
+  // Set no eventual consistency, that way queries return all results.
+  // https://cloud.google.com/appengine/docs/java/tools/localunittesting
+  // #Java_Writing_High_Replication_Datastore_tests
   private final LocalServiceTestHelper helper =
       new LocalServiceTestHelper(
-          // Set no eventual consistency, that way queries return all results.
-          // https://cloud.google
-          // .com/appengine/docs/java/tools/localunittesting
-          // #Java_Writing_High_Replication_Datastore_tests
           new LocalDatastoreServiceTestConfig()
               .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
 

diff --git a/appengine-java8/datastore/src/test/java/com/example/appengine/ListPeopleServletTest.java b/appengine-java8/datastore/src/test/java/com/example/appengine/ListPeopleServletTest.java
@@ -74,12 +74,11 @@ public class ListPeopleServletTest {
           .add("Tango")
           .build();
 
+  // Set no eventual consistency, that way queries return all results.
+  // https://cloud.google.com/appengine/docs/java/tools/localunittesting
+  // #Java_Writing_High_Replication_Datastore_tests
   private final LocalServiceTestHelper helper =
       new LocalServiceTestHelper(
-          // Set no eventual consistency, that way queries return all results.
-          // https://cloud.google
-          // .com/appengine/docs/java/tools/localunittesting
-          // #Java_Writing_High_Replication_Datastore_tests
           new LocalDatastoreServiceTestConfig()
               .setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
 

diff --git a/appengine-java8/datastore/src/test/java/com/example/appengine/MetadataEntityGroupTest.java b/appengine-java8/datastore/src/test/java/com/example/appengine/MetadataEntityGroupTest.java
@@ -48,12 +48,11 @@
 @RunWith(JUnit4.class)
 public class MetadataEntityGroupTest {
 
+  // Set no eventual consistency, that way queries return all results.
+  // https://cloud.google.com/appengine/docs/java/tools/localunittesting
+  // #Java_Writing_High_Replication_Datastore_tests
   private final LocalServiceTestHelper helper =
       new LocalServiceTestHelper(
-          // Set no eventual consistency, that way queries return all results.
-          // https://cloud.google
-          // .com/appengine/docs/java/tools/localunittesting
-          // #Java_Writing_High_Replication_Datastore_tests
           new LocalDatastoreServiceTestConfig().setDefaultHighRepJobPolicyUnappliedJobPercentage(0),
           new LocalMemcacheServiceTestConfig());
 

diff --git a/appengine-java8/gaeinfo/src/main/java/com/example/appengine/standard/GaeInfoServlet.java b/appengine-java8/gaeinfo/src/main/java/com/example/appengine/standard/GaeInfoServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2017 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java b/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2014-2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java b/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2014-2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java b/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2014-2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/...e-java8/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java b/...e-java8/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2014-2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

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
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java b/appengine-java8/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/multitenancy/src/main/java/com/example/appengine/Guestbook.java b/appengine-java8/multitenancy/src/main/java/com/example/appengine/Guestbook.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2014-2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/multitenancy/src/main/java/com/example/appengine/OfyHelper.java b/appengine-java8/multitenancy/src/main/java/com/example/appengine/OfyHelper.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2014-2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/multitenancy/src/main/java/com/example/appengine/SignGuestbookServlet.java b/appengine-java8/multitenancy/src/main/java/com/example/appengine/SignGuestbookServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2014-2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/oauth2/src/main/java/com/example/appengine/HelloServlet.java b/appengine-java8/oauth2/src/main/java/com/example/appengine/HelloServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/...gine-java8/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java b/...gine-java8/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/search/src/main/java/com/example/appengine/search/SearchOptionServlet.java b/appengine-java8/search/src/main/java/com/example/appengine/search/SearchOptionServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
@@ -14,6 +14,9 @@
 
 package com.example.appengine.search;
 
+// CHECKSTYLE:OFF
+// @formatter:off
+// [START search_option_import]
 import com.google.appengine.api.search.Document;
 import com.google.appengine.api.search.Field;
 import com.google.appengine.api.search.Index;
@@ -26,6 +29,9 @@
 import com.google.appengine.api.search.SearchServiceFactory;
 import com.google.appengine.api.search.SortExpression;
 import com.google.appengine.api.search.SortOptions;
+// [END search_option_import]
+// @formatter:on
+// CHECKSTYLE:ON
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.logging.Logger;
@@ -34,13 +40,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-// CHECKSTYLE:OFF
-// @formatter:off
-// [START search_option_import]
-// [END search_option_import]
-// @formatter:on
-// CHECKSTYLE:ON
-
 /**
  * Code snippet for searching with query options.
  */

diff --git a/appengine-java8/search/src/main/java/com/example/appengine/search/SearchServlet.java b/appengine-java8/search/src/main/java/com/example/appengine/search/SearchServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
@@ -25,18 +25,17 @@
 import com.google.appengine.api.search.SearchException;
 import com.google.appengine.api.search.SearchServiceFactory;
 import com.google.appengine.api.search.StatusCode;
+// [END search_document_import]
+// CHECKSTYLE:OFF
+// @formatter:on
+// CHECKSTYLE:ON
 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;
 
-// [END search_document_import]
-// CHECKSTYLE:OFF
-// @formatter:on
-// CHECKSTYLE:ON
-
 @SuppressWarnings("serial")
 @WebServlet(
     name = "search",

diff --git a/appengine-java8/search/src/main/java/com/example/appengine/search/Utils.java b/appengine-java8/search/src/main/java/com/example/appengine/search/Utils.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/search/src/test/java/com/example/appengine/search/DeleteServletTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/DeleteServletTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/search/src/test/java/com/example/appengine/search/DocumentServletTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/DocumentServletTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/search/src/test/java/com/example/appengine/search/IndexServletTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/IndexServletTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/search/src/test/java/com/example/appengine/search/SchemaServletTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/SchemaServletTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/...gine-java8/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java b/...gine-java8/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/search/src/test/java/com/example/appengine/search/SearchServletTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/SearchServletTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/search/src/test/java/com/example/appengine/search/UtilsTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/UtilsTest.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2016 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/...kqueues-deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java b/...kqueues-deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/taskqueues-pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java b/appengine-java8/taskqueues-pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/...ine-java8/taskqueues-push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java b/...ine-java8/taskqueues-push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java
@@ -16,19 +16,17 @@
 package com.example.appengine.taskqueue.push;
 
 // [START import]
-
 import com.google.appengine.api.taskqueue.Queue;
 import com.google.appengine.api.taskqueue.QueueFactory;
 import com.google.appengine.api.taskqueue.TaskOptions;
+// [END import]
 import java.io.IOException;
 import javax.servlet.ServletException;
 import javax.servlet.annotation.WebServlet;
 import javax.servlet.http.HttpServlet;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-// [END import]
-
 // [START enqueue]
 // The Enqueue servlet should be mapped to the "/enqueue" URL.
 // With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.

diff --git a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java b/appengine-java8/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/flexible/analytics/src/main/java/com/example/analytics/AnalyticsServlet.java b/flexible/analytics/src/main/java/com/example/analytics/AnalyticsServlet.java
@@ -1,4 +1,4 @@
-/**
+/*
  * Copyright 2015 Google Inc.
  *
  * <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

diff --git a/travis.sh b/travis.sh
@@ -79,7 +79,10 @@ echo "Common Dir: ${common_dir}"
 
 # Give Maven a bit more memory
 export MAVEN_OPTS='-Xmx800m -Xms400m'
-mvn --batch-mode clean verify -e -DskipTests=$SKIP_TESTS | \
+mvn --batch-mode clean verify -e \
+    -DskipTests=$SKIP_TESTS \
+    -Dbigtable.projectID="${GOOGLE_CLOUD_PROJECT}" \
+    -Dbigtable.instanceID=instance | \
   grep -E -v "(^\[INFO\] Download|^\[INFO\].*skipping)"
 
 [ -z "$common_dir" ] || popd