Skip to content

Commit e76986f

Browse files
author
Les Vogel
committed
Fix bad formatting
Most of @tswast asks are done. <li> doesn’t need to be closed I decided to go w/ broken URL’s, but better so at least the main link would work. They are way too long.
1 parent b656433 commit e76986f

File tree

40 files changed

+64
-90
lines changed

40 files changed

+64
-90
lines changed

.editorconfig

-19
This file was deleted.

appengine-java8/analytics/src/main/java/com/example/appengine/analytics/AnalyticsServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/bigtable/src/test/java/com/example/bigtable/ITBigtableHelloWorld.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/datastore/src/test/java/com/example/appengine/EntitiesTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,11 @@
4646
@RunWith(JUnit4.class)
4747
public class EntitiesTest {
4848

49+
// Set no eventual consistency, that way queries return all results.
50+
// https://cloud.google.com/appengine/docs/java/tools/localunittesting
51+
// #Java_Writing_High_Replication_Datastore_tests
4952
private final LocalServiceTestHelper helper =
5053
new LocalServiceTestHelper(
51-
// Set no eventual consistency, that way queries return all results.
52-
// https://cloud.google
53-
// .com/appengine/docs/java/tools/localunittesting
54-
// #Java_Writing_High_Replication_Datastore_tests
5554
new LocalDatastoreServiceTestConfig()
5655
.setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
5756

appengine-java8/datastore/src/test/java/com/example/appengine/GuestbookStrongTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,11 @@ public class GuestbookStrongTest {
3939
private static final Instant FAKE_NOW = new Instant(1234567890L);
4040
private static final String GUESTBOOK_ID = "my guestbook";
4141

42+
// Set maximum eventual consistency.
43+
// https://cloud.google.com/appengine/docs/java/tools/localunittesting
44+
// #Java_Writing_High_Replication_Datastore_tests
4245
private final LocalServiceTestHelper helper =
4346
new LocalServiceTestHelper(
44-
// Set maximum eventual consistency.
45-
// https://cloud.google
46-
// .com/appengine/docs/java/tools/localunittesting
47-
// #Java_Writing_High_Replication_Datastore_tests
4847
new LocalDatastoreServiceTestConfig()
4948
.setDefaultHighRepJobPolicyUnappliedJobPercentage(100),
5049
// Make sure there is a user logged in. We enforce this in web.xml.

appengine-java8/datastore/src/test/java/com/example/appengine/GuestbookTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,11 @@ public boolean shouldRollForwardExistingJob(Key entityGroup) {
5555
}
5656
}
5757

58+
// Set custom, deterministic, eventual consistency.
59+
// https://cloud.google.com/appengine/docs/java/tools/localunittesting
60+
// #Java_Writing_High_Replication_Datastore_tests
5861
private final LocalServiceTestHelper helper =
5962
new LocalServiceTestHelper(
60-
// Set custom, deterministic, eventual consistency.
61-
// https://cloud.google
62-
// .com/appengine/docs/java/tools/localunittesting
63-
// #Java_Writing_High_Replication_Datastore_tests
6463
new LocalDatastoreServiceTestConfig()
6564
.setAlternateHighRepJobPolicyClass(CustomHighRepJobPolicy.class),
6665
// Make sure there is a user logged in. We enforce this in web.xml.

appengine-java8/datastore/src/test/java/com/example/appengine/IndexesTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,11 @@
4343
@RunWith(JUnit4.class)
4444
public class IndexesTest {
4545

46+
// Set no eventual consistency, that way queries return all results.
47+
// https://cloud.google.com/appengine/docs/java/tools/localunittesting
48+
// #Java_Writing_High_Replication_Datastore_tests
4649
private final LocalServiceTestHelper helper =
4750
new LocalServiceTestHelper(
48-
// Set no eventual consistency, that way queries return all results.
49-
// https://cloud.google
50-
// .com/appengine/docs/java/tools/localunittesting
51-
// #Java_Writing_High_Replication_Datastore_tests
5251
new LocalDatastoreServiceTestConfig()
5352
.setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
5453

appengine-java8/datastore/src/test/java/com/example/appengine/ListPeopleServletTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,11 @@ public class ListPeopleServletTest {
7474
.add("Tango")
7575
.build();
7676

77+
// Set no eventual consistency, that way queries return all results.
78+
// https://cloud.google.com/appengine/docs/java/tools/localunittesting
79+
// #Java_Writing_High_Replication_Datastore_tests
7780
private final LocalServiceTestHelper helper =
7881
new LocalServiceTestHelper(
79-
// Set no eventual consistency, that way queries return all results.
80-
// https://cloud.google
81-
// .com/appengine/docs/java/tools/localunittesting
82-
// #Java_Writing_High_Replication_Datastore_tests
8382
new LocalDatastoreServiceTestConfig()
8483
.setDefaultHighRepJobPolicyUnappliedJobPercentage(0));
8584

appengine-java8/datastore/src/test/java/com/example/appengine/MetadataEntityGroupTest.java

+3-4
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,11 @@
4848
@RunWith(JUnit4.class)
4949
public class MetadataEntityGroupTest {
5050

51+
// Set no eventual consistency, that way queries return all results.
52+
// https://cloud.google.com/appengine/docs/java/tools/localunittesting
53+
// #Java_Writing_High_Replication_Datastore_tests
5154
private final LocalServiceTestHelper helper =
5255
new LocalServiceTestHelper(
53-
// Set no eventual consistency, that way queries return all results.
54-
// https://cloud.google
55-
// .com/appengine/docs/java/tools/localunittesting
56-
// #Java_Writing_High_Replication_Datastore_tests
5756
new LocalDatastoreServiceTestConfig().setDefaultHighRepJobPolicyUnappliedJobPercentage(0),
5857
new LocalMemcacheServiceTestConfig());
5958

appengine-java8/gaeinfo/src/main/java/com/example/appengine/standard/GaeInfoServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2017 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Greeting.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2014-2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/Guestbook.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2014-2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/OfyHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2014-2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/guestbook-objectify/src/main/java/com/example/guestbook/SignGuestbookServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2014-2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/mailgun/src/main/java/com/example/appengine/mailgun/MailgunServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/mailjet/src/main/java/com/example/appengine/mailjet/MailjetServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/multitenancy/src/main/java/com/example/appengine/Guestbook.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2014-2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/multitenancy/src/main/java/com/example/appengine/OfyHelper.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2014-2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/multitenancy/src/main/java/com/example/appengine/SignGuestbookServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2014-2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/oauth2/src/main/java/com/example/appengine/HelloServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/remote-client/src/main/java/com/example/appengine/remote/RemoteApiExample.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/search/src/main/java/com/example/appengine/search/SearchOptionServlet.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
@@ -14,6 +14,9 @@
1414

1515
package com.example.appengine.search;
1616

17+
// CHECKSTYLE:OFF
18+
// @formatter:off
19+
// [START search_option_import]
1720
import com.google.appengine.api.search.Document;
1821
import com.google.appengine.api.search.Field;
1922
import com.google.appengine.api.search.Index;
@@ -26,6 +29,9 @@
2629
import com.google.appengine.api.search.SearchServiceFactory;
2730
import com.google.appengine.api.search.SortExpression;
2831
import com.google.appengine.api.search.SortOptions;
32+
// [END search_option_import]
33+
// @formatter:on
34+
// CHECKSTYLE:ON
2935
import java.io.IOException;
3036
import java.io.PrintWriter;
3137
import java.util.logging.Logger;
@@ -34,13 +40,6 @@
3440
import javax.servlet.http.HttpServletRequest;
3541
import javax.servlet.http.HttpServletResponse;
3642

37-
// CHECKSTYLE:OFF
38-
// @formatter:off
39-
// [START search_option_import]
40-
// [END search_option_import]
41-
// @formatter:on
42-
// CHECKSTYLE:ON
43-
4443
/**
4544
* Code snippet for searching with query options.
4645
*/

appengine-java8/search/src/main/java/com/example/appengine/search/SearchServlet.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file
@@ -25,18 +25,17 @@
2525
import com.google.appengine.api.search.SearchException;
2626
import com.google.appengine.api.search.SearchServiceFactory;
2727
import com.google.appengine.api.search.StatusCode;
28+
// [END search_document_import]
29+
// CHECKSTYLE:OFF
30+
// @formatter:on
31+
// CHECKSTYLE:ON
2832
import java.io.IOException;
2933
import java.io.PrintWriter;
3034
import javax.servlet.annotation.WebServlet;
3135
import javax.servlet.http.HttpServlet;
3236
import javax.servlet.http.HttpServletRequest;
3337
import javax.servlet.http.HttpServletResponse;
3438

35-
// [END search_document_import]
36-
// CHECKSTYLE:OFF
37-
// @formatter:on
38-
// CHECKSTYLE:ON
39-
4039
@SuppressWarnings("serial")
4140
@WebServlet(
4241
name = "search",

appengine-java8/search/src/main/java/com/example/appengine/search/Utils.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/search/src/test/java/com/example/appengine/search/DeleteServletTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/search/src/test/java/com/example/appengine/search/DocumentServletTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/search/src/test/java/com/example/appengine/search/IndexServletTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/search/src/test/java/com/example/appengine/search/SchemaServletTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/search/src/test/java/com/example/appengine/search/SearchOptionServletTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/search/src/test/java/com/example/appengine/search/SearchServletTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/search/src/test/java/com/example/appengine/search/UtilsTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2016 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/taskqueues-deferred/src/main/java/com/google/cloud/taskqueue/samples/DeferSampleServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/taskqueues-pull/src/main/java/com/example/taskqueue/TaskqueueServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/taskqueues-push/src/main/java/com/example/appengine/taskqueue/push/Enqueue.java

+1-3
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,17 @@
1616
package com.example.appengine.taskqueue.push;
1717

1818
// [START import]
19-
2019
import com.google.appengine.api.taskqueue.Queue;
2120
import com.google.appengine.api.taskqueue.QueueFactory;
2221
import com.google.appengine.api.taskqueue.TaskOptions;
22+
// [END import]
2323
import java.io.IOException;
2424
import javax.servlet.ServletException;
2525
import javax.servlet.annotation.WebServlet;
2626
import javax.servlet.http.HttpServlet;
2727
import javax.servlet.http.HttpServletRequest;
2828
import javax.servlet.http.HttpServletResponse;
2929

30-
// [END import]
31-
3230
// [START enqueue]
3331
// The Enqueue servlet should be mapped to the "/enqueue" URL.
3432
// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.

appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveCallServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/twilio/src/main/java/com/example/appengine/twilio/ReceiveSmsServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

appengine-java8/twilio/src/main/java/com/example/appengine/twilio/SendSmsServlet.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/**
1+
/*
22
* Copyright 2015 Google Inc.
33
*
44
* <p>Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file

travis.sh

+4-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,10 @@ echo "Common Dir: ${common_dir}"
7979

8080
# Give Maven a bit more memory
8181
export MAVEN_OPTS='-Xmx800m -Xms400m'
82-
mvn --batch-mode clean verify -e -DskipTests=$SKIP_TESTS | \
82+
mvn --batch-mode clean verify -e \
83+
-DskipTests=$SKIP_TESTS \
84+
-Dbigtable.projectID="${GOOGLE_CLOUD_PROJECT}" \
85+
-Dbigtable.instanceID=instance | \
8386
grep -E -v "(^\[INFO\] Download|^\[INFO\].*skipping)"
8487

8588
[ -z "$common_dir" ] || popd

0 commit comments

Comments
 (0)