Skip to content

Commit bd53b6c

Browse files
lesvlesv
authored
First pass of many formatting fixes (GoogleCloudPlatform#820)
Update to new plugin, fix formatting for GAE J8 Std
1 parent 5a16c30 commit bd53b6c

File tree

132 files changed

+1774
-1655
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+1774
-1655
lines changed

‎.editorconfig

+19
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
[*]
2+
charset=utf-8
3+
end_of_line=lf
4+
insert_final_newline=false
5+
indent_style=space
6+
indent_size=2
7+
8+
[{*.gson,*.gradle,*.groovy,*.gant,*.gdsl,*.gy}]
9+
indent_style=space
10+
indent_size=4
11+
12+
[{*.xjsp,*.tag,*.jsf,*.jsp,*.jspf,*.tagf}]
13+
indent_style=space
14+
indent_size=4
15+
16+
[{*.yml,*.yaml}]
17+
indent_style=space
18+
indent_size=2
19+

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

+4-3
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
* express or implied. See the License for the specific language governing permissions and
1212
* limitations under the License.
1313
*/
14+
1415
package com.example.appengine.analytics;
1516

1617
import com.google.appengine.api.urlfetch.URLFetchService;
@@ -30,9 +31,9 @@
3031
@SuppressWarnings("serial")
3132
// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
3233
@WebServlet(
33-
name = "analytics",
34-
description = "Analytics: Send Analytics Event to Google Analytics",
35-
urlPatterns = "/analytics"
34+
name = "analytics",
35+
description = "Analytics: Send Analytics Event to Google Analytics",
36+
urlPatterns = "/analytics"
3637
)
3738
public class AnalyticsServlet extends HttpServlet {
3839

‎appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/IdentityServlet.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,19 @@
1717
package com.example.appengine.appidentity;
1818

1919
import com.google.apphosting.api.ApiProxy;
20-
2120
import java.io.IOException;
22-
2321
import javax.servlet.annotation.WebServlet;
2422
import javax.servlet.http.HttpServlet;
2523
import javax.servlet.http.HttpServletRequest;
2624
import javax.servlet.http.HttpServletResponse;
2725

2826
@SuppressWarnings("serial")
2927
// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
30-
@WebServlet(name = "appidentity", description = "AppIdentity: Get the Host Name",
31-
urlPatterns = "/appidentity/identity")
28+
@WebServlet(
29+
name = "appidentity",
30+
description = "AppIdentity: Get the Host Name",
31+
urlPatterns = "/appidentity/identity"
32+
)
3233
public class IdentityServlet extends HttpServlet {
3334

3435
// [START versioned_hostnames]

‎appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/SignForAppServlet.java

+7-8
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import com.google.appengine.api.appidentity.AppIdentityService;
2020
import com.google.appengine.api.appidentity.AppIdentityServiceFactory;
2121
import com.google.appengine.api.appidentity.PublicCertificate;
22-
2322
import java.io.ByteArrayInputStream;
2423
import java.io.IOException;
2524
import java.io.InputStream;
@@ -35,17 +34,20 @@
3534
import java.util.Arrays;
3635
import java.util.Calendar;
3736
import java.util.Collection;
38-
3937
import javax.servlet.annotation.WebServlet;
4038
import javax.servlet.http.HttpServlet;
4139
import javax.servlet.http.HttpServletRequest;
4240
import javax.servlet.http.HttpServletResponse;
4341

4442
@SuppressWarnings("serial")
4543
// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
46-
@WebServlet(name = "signforapp", description = "AppIdentity: Sign 'abcdefg'",
47-
urlPatterns = "/appidentity/sign")
44+
@WebServlet(
45+
name = "signforapp",
46+
description = "AppIdentity: Sign 'abcdefg'",
47+
urlPatterns = "/appidentity/sign"
48+
)
4849
public class SignForAppServlet extends HttpServlet {
50+
4951
private final AppIdentityService appIdentity;
5052

5153
public SignForAppServlet() {
@@ -98,10 +100,7 @@ private String simulateIdentityAssertion()
98100

99101
return String.format(
100102
"isValid=%b for message: %s\n\tsignature: %s\n\tpublic cert: %s",
101-
isValid,
102-
message,
103-
Arrays.toString(blobSignature),
104-
Arrays.toString(publicCert));
103+
isValid, message, Arrays.toString(blobSignature), Arrays.toString(publicCert));
105104
}
106105
// [END asserting_identity_to_other_services]
107106

‎appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortener.java

+7-9
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,20 @@
1919
import com.google.appengine.api.appidentity.AppIdentityService;
2020
import com.google.appengine.api.appidentity.AppIdentityServiceFactory;
2121
import com.google.common.io.CharStreams;
22-
23-
import org.json.JSONObject;
24-
import org.json.JSONTokener;
25-
2622
import java.io.InputStream;
2723
import java.io.InputStreamReader;
2824
import java.io.OutputStreamWriter;
2925
import java.net.HttpURLConnection;
3026
import java.net.URL;
3127
import java.nio.charset.StandardCharsets;
3228
import java.util.ArrayList;
29+
import org.json.JSONObject;
30+
import org.json.JSONTokener;
3331

3432
@SuppressWarnings("serial")
3533
class UrlShortener {
3634
// [START asserting_identity_to_Google_APIs]
35+
3736
/**
3837
* Returns a shortened URL by calling the Google URL Shortener API.
3938
*
@@ -68,11 +67,10 @@ public String createShortUrl(String longUrl) throws Exception {
6867
} else {
6968
try (InputStream s = connection.getErrorStream();
7069
InputStreamReader r = new InputStreamReader(s, StandardCharsets.UTF_8)) {
71-
throw new RuntimeException(String.format(
72-
"got error (%d) response %s from %s",
73-
connection.getResponseCode(),
74-
CharStreams.toString(r),
75-
connection.toString()));
70+
throw new RuntimeException(
71+
String.format(
72+
"got error (%d) response %s from %s",
73+
connection.getResponseCode(), CharStreams.toString(r), connection.toString()));
7674
}
7775
}
7876
}

‎appengine-java8/appidentity/src/main/java/com/example/appengine/appidentity/UrlShortenerServlet.java

+6-3
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,20 @@
1818

1919
import java.io.IOException;
2020
import java.io.PrintWriter;
21-
2221
import javax.servlet.annotation.WebServlet;
2322
import javax.servlet.http.HttpServlet;
2423
import javax.servlet.http.HttpServletRequest;
2524
import javax.servlet.http.HttpServletResponse;
2625

2726
@SuppressWarnings("serial")
2827
// With @WebServlet annotation the webapp/WEB-INF/web.xml is no longer required.
29-
@WebServlet(name = "UrlShortener", description = "AppIdentity: Url Shortener",
30-
urlPatterns = "/appidentity/shorten")
28+
@WebServlet(
29+
name = "UrlShortener",
30+
description = "AppIdentity: Url Shortener",
31+
urlPatterns = "/appidentity/shorten"
32+
)
3133
public class UrlShortenerServlet extends HttpServlet {
34+
3235
private final UrlShortener shortener;
3336

3437
public UrlShortenerServlet() {

‎appengine-java8/appidentity/src/test/java/com/example/appengine/appidentity/IdentityServletTest.java

+10-10
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
import static org.mockito.Mockito.when;
2121

2222
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
23-
23+
import java.io.PrintWriter;
24+
import java.io.StringWriter;
25+
import javax.servlet.http.HttpServletRequest;
26+
import javax.servlet.http.HttpServletResponse;
2427
import org.junit.After;
2528
import org.junit.Before;
2629
import org.junit.Test;
@@ -29,12 +32,6 @@
2932
import org.mockito.Mock;
3033
import org.mockito.MockitoAnnotations;
3134

32-
import java.io.PrintWriter;
33-
import java.io.StringWriter;
34-
35-
import javax.servlet.http.HttpServletRequest;
36-
import javax.servlet.http.HttpServletResponse;
37-
3835
/**
3936
* Unit tests for {@link IdentityServlet}.
4037
*/
@@ -44,8 +41,10 @@ public class IdentityServletTest {
4441
// Set up a helper so that the ApiProxy returns a valid environment for local testing.
4542
private final LocalServiceTestHelper helper = new LocalServiceTestHelper();
4643

47-
@Mock private HttpServletRequest mockRequest;
48-
@Mock private HttpServletResponse mockResponse;
44+
@Mock
45+
private HttpServletRequest mockRequest;
46+
@Mock
47+
private HttpServletResponse mockResponse;
4948
private StringWriter responseWriter;
5049
private IdentityServlet servletUnderTest;
5150

@@ -61,7 +60,8 @@ public void setUp() throws Exception {
6160
servletUnderTest = new IdentityServlet();
6261
}
6362

64-
@After public void tearDown() {
63+
@After
64+
public void tearDown() {
6565
helper.tearDown();
6666
}
6767

‎appengine-java8/appidentity/src/test/java/com/example/appengine/appidentity/SignForAppServletTest.java

+14-12
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,10 @@
2020
import static org.mockito.Mockito.when;
2121

2222
import com.google.appengine.tools.development.testing.LocalServiceTestHelper;
23-
23+
import java.io.PrintWriter;
24+
import java.io.StringWriter;
25+
import javax.servlet.http.HttpServletRequest;
26+
import javax.servlet.http.HttpServletResponse;
2427
import org.junit.After;
2528
import org.junit.Before;
2629
import org.junit.Test;
@@ -29,12 +32,6 @@
2932
import org.mockito.Mock;
3033
import org.mockito.MockitoAnnotations;
3134

32-
import java.io.PrintWriter;
33-
import java.io.StringWriter;
34-
35-
import javax.servlet.http.HttpServletRequest;
36-
import javax.servlet.http.HttpServletResponse;
37-
3835
/**
3936
* Unit tests for {@link SignForAppServlet}.
4037
*/
@@ -43,12 +40,15 @@ public class SignForAppServletTest {
4340

4441
private final LocalServiceTestHelper helper = new LocalServiceTestHelper();
4542

46-
@Mock private HttpServletRequest mockRequest;
47-
@Mock private HttpServletResponse mockResponse;
43+
@Mock
44+
private HttpServletRequest mockRequest;
45+
@Mock
46+
private HttpServletResponse mockResponse;
4847
private StringWriter responseWriter;
4948
private SignForAppServlet servletUnderTest;
5049

51-
@Before public void setUp() throws Exception {
50+
@Before
51+
public void setUp() throws Exception {
5252
MockitoAnnotations.initMocks(this);
5353
helper.setUp();
5454

@@ -59,11 +59,13 @@ public class SignForAppServletTest {
5959
servletUnderTest = new SignForAppServlet();
6060
}
6161

62-
@After public void tearDown() {
62+
@After
63+
public void tearDown() {
6364
helper.tearDown();
6465
}
6566

66-
@Test public void doGet_defaultEnvironment_successfullyVerifiesSignature() throws Exception {
67+
@Test
68+
public void doGet_defaultEnvironment_successfullyVerifiesSignature() throws Exception {
6769
servletUnderTest.doGet(mockRequest, mockResponse);
6870

6971
assertThat(responseWriter.toString())

‎appengine-java8/bigtable/src/main/java/com/example/bigtable/BigtableHelloWorld.java

+14-13
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
package com.example.bigtable;
1818

19+
import java.io.IOException;
1920
import org.apache.hadoop.hbase.HColumnDescriptor;
2021
import org.apache.hadoop.hbase.HTableDescriptor;
2122
import org.apache.hadoop.hbase.TableName;
@@ -28,12 +29,11 @@
2829
import org.apache.hadoop.hbase.client.Scan;
2930
import org.apache.hadoop.hbase.client.Table;
3031
import org.apache.hadoop.hbase.util.Bytes;
31-
32-
import java.io.IOException;
3332
// [START example]
33+
3434
/**
35-
* A minimal application that connects to Cloud Bigtable using the native HBase API
36-
* and performs some basic operations.
35+
* A minimal application that connects to Cloud Bigtable using the native HBase API and performs
36+
* some basic operations.
3737
*/
3838
public class BigtableHelloWorld {
3939

@@ -43,13 +43,18 @@ public class BigtableHelloWorld {
4343
private static final byte[] COLUMN_NAME = Bytes.toBytes("greeting");
4444

4545
// Write some friendly greetings to Cloud Bigtable
46-
private static final String[] GREETINGS =
47-
{ "Hello World!", "Hello Cloud Bigtable!", "Hello HBase!" };
48-
46+
private static final String[] GREETINGS = {
47+
"Hello World!", "Hello Cloud Bigtable!", "Hello HBase!"
48+
};
4949

50+
/**
51+
* Create a table -- first time only.
52+
* @param connection to Bigtable
53+
* @return the status
54+
*/
5055
public static String create(Connection connection) {
5156
try {
52-
// The admin API lets us create, manage and delete tables
57+
// The admin API lets us create, manage and delete tables
5358
Admin admin = connection.getAdmin();
5459
// [END connecting_to_bigtable]
5560

@@ -66,9 +71,7 @@ public static String create(Connection connection) {
6671
return "Create table " + Bytes.toString(TABLE_NAME);
6772
}
6873

69-
/**
70-
* Connects to Cloud Bigtable, runs some basic operations and prints the results.
71-
*/
74+
/** Connects to Cloud Bigtable, runs some basic operations and prints the results. */
7275
public static String doHelloWorld() {
7376

7477
StringBuilder result = new StringBuilder();
@@ -141,7 +144,5 @@ public static String doHelloWorld() {
141144

142145
return result.toString();
143146
}
144-
145-
146147
}
147148
// [END example]

0 commit comments

Comments
 (0)