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 index a67482ccc5c..ed326224e4c 100644 --- 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. * *
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 index f3dea2f7305..f3d112c1435 100644 --- 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. * *
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 index a9579d51632..31d674e326b 100644 --- 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 index fd7a73990c7..c23fa11f666 100644 --- 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 index 96836357318..bafdbe458ca 100644 --- 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 index b0a491d43f3..a75012a9087 100644 --- 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 index 4652c475fe2..9ddb50e316f 100644 --- 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 index 701fa4b151d..f01b666784d 100644 --- 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 index 3ef89f7bcac..d2f183cb293 100644 --- 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. * *
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 index 1373cb2866c..9536eb2cd4a 100644 --- 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. * *
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 index 0f0083fd265..5717af7f5fa 100644 --- 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. * *
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 index a16b854ca65..dbe7582d6c3 100644 --- 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. * *
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/SignGuestbookServlet.java b/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java index aa92c2cd7c8..2542869111b 100644 --- a/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java +++ b/appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2014-2015 Google Inc. * *
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 index f946b1929f8..34a6a7d283b 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 @@ -1,4 +1,4 @@ -/** +/* * Copyright 2015 Google Inc. * *
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 index ebee1c53216..14baf5f114e 100644 --- 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. * *
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 index 265c10aeaa2..22e94cf01f5 100644 --- 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. * *
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 index a9355860e50..b5e225700ba 100644 --- 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. * *
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 index 306366801f8..3941927edaa 100644 --- 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. * *
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 index fafd2f7c059..d7d9477ef49 100644 --- 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. * *
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file diff --git a/appengine-java8/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java b/appengine-java8/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java index bea44ca66e1..e1ec3ab045e 100644 --- a/appengine-java8/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java +++ b/appengine-java8/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016 Google Inc. * *
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 index 0edc90337b1..fb9ea08fb0b 100644 --- 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. * *
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 index 03df78995f9..60c47675aa3 100644 --- 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. * *
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file @@ -25,6 +25,10 @@ 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; @@ -32,11 +36,6 @@ 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 index 93b93463b66..b504f4613dc 100644 --- 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. * *
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 index f5f98061e2f..f60d8e8daf4 100644 --- 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. * *
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 index 995c5a9030c..0e94495b06c 100644 --- 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. * *
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 index 707d19e1c35..6f3ed56082a 100644 --- 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. * *
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 index ab556413714..e8d20dfaf3d 100644 --- 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. * *
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/SearchOptionServletTest.java b/appengine-java8/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java index 851d8d076f3..3b8b3a3ecfe 100644 --- a/appengine-java8/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java +++ b/appengine-java8/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2016 Google Inc. * *
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 index 2f7c3184235..1f11f2f4111 100644 --- 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. * *
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 index 5ff98c8dca7..daf2c7d45b2 100644 --- 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. * *
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file diff --git a/appengine-java8/taskqueues-deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java b/appengine-java8/taskqueues-deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java index 5f3cf3c880a..146509033bf 100644 --- a/appengine-java8/taskqueues-deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java +++ b/appengine-java8/taskqueues-deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java @@ -1,4 +1,4 @@ -/** +/* * Copyright 2015 Google Inc. * *
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 index a0a06d25656..b70c9ee32b0 100644 --- 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. * *
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file diff --git a/appengine-java8/taskqueues-push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java b/appengine-java8/taskqueues-push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java index e52bb584f1d..9acebe51934 100644 --- a/appengine-java8/taskqueues-push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java +++ b/appengine-java8/taskqueues-push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java @@ -16,10 +16,10 @@ 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; @@ -27,8 +27,6 @@ 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 index d3cfd1109ca..6537a76c21c 100644 --- 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. * *
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 index 7d889acf85b..a48b5c0c8b7 100644 --- 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. * *
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 index 5af258fdaaa..423ca41dc6b 100644 --- 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. * *
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 index 2d0dbb4df4b..91abafe3e63 100644 --- 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. * *
Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file diff --git a/travis.sh b/travis.sh index 35bd60fc90a..d892276cc52 100755 --- 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